[Pkg-kde-commits] rev 2194 - trunk/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Fri Nov 11 15:59:08 UTC 2005
Author: chrsmrtn
Date: 2005-11-11 15:58:53 +0000 (Fri, 11 Nov 2005)
New Revision: 2194
Modified:
trunk/packages/kdebase/debian/patches/98_buildprep.diff
Log:
Updates buildprep for 3.5.0-rc1.
Modified: trunk/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/98_buildprep.diff 2005-11-11 15:58:11 UTC (rev 2193)
+++ trunk/packages/kdebase/debian/patches/98_buildprep.diff 2005-11-11 15:58:53 UTC (rev 2194)
@@ -2,7 +2,7 @@
# vi: ft=diff
--- acinclude.m4
+++ acinclude.m4
-@@ -1688,15 +1688,6 @@
+@@ -1689,15 +1689,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -18,7 +18,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2138,9 +2129,6 @@
+@@ -2144,9 +2135,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28,10 +28,33 @@
AC_TRY_COMPILE([
$2
],
-@@ -3288,39 +3276,39 @@
+@@ -3351,63 +3339,63 @@
- if test "x$GXX" = "xyes"; then
- kde_have_gcc_visibility=no
+ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+ [
+- AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
+-
+- AC_MSG_CHECKING([grepping for visibility push/pop in headers])
+-
+- if test "x$GXX" = "xyes"; then
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
+- AC_EGREP_CPP(
+- [GCC visibility push],
+- [ #include <exception>
+- ],
+- [
+- AC_MSG_RESULT(yes)
+- kde_stdc_visibility_patched=yes ],
+- [
+- AC_MSG_RESULT(no)
+- AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
+- visibility support. Disabling -fvisibility=hidden])
+-
+- kde_stdc_visibility_patched=no ])
+- AC_LANG_RESTORE
+-
+- kde_have_gcc_visibility=no
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
- kde_have_gcc_visibility=yes
@@ -58,13 +81,37 @@
- ]
- )
-
-- if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+- if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
- KDE_CHECK_VISIBILITY_GCC_BUG
- HAVE_GCC_VISIBILITY=1
- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
- fi
- ])
+- fi
++dnl AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
++dnl
++dnl AC_MSG_CHECKING([grepping for visibility push/pop in headers])
++dnl
++dnl if test "x$GXX" = "xyes"; then
++dnl AC_LANG_SAVE
++dnl AC_LANG_CPLUSPLUS
++dnl AC_EGREP_CPP(
++dnl [GCC visibility push],
++dnl [ #include <exception>
++dnl ],
++dnl [
++dnl AC_MSG_RESULT(yes)
++dnl kde_stdc_visibility_patched=yes ],
++dnl [
++dnl AC_MSG_RESULT(no)
++dnl AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
++dnl visibility support. Disabling -fvisibility=hidden])
++dnl
++dnl kde_stdc_visibility_patched=no ])
++dnl AC_LANG_RESTORE
++dnl
++dnl kde_have_gcc_visibility=no
+dnl KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+dnl [
+dnl kde_have_gcc_visibility=yes
@@ -78,11 +125,11 @@
+dnl
+dnl AC_TRY_COMPILE(
+dnl [
-+dnl #include <qglobal.h>
-+dnl #if Q_EXPORT - 0 != 0
-+dnl /* if this compiles, then Q_EXPORT is undefined */
-+dnl /* if Q_EXPORT is nonempty, this will break compilation */
-+dnl #endif
++dnl#include <qglobal.h>
++dnl#if Q_EXPORT - 0 != 0
++dnl/* if this compiles, then Q_EXPORT is undefined */
++dnl/* if Q_EXPORT is nonempty, this will break compilation */
++dnl#endif
+dnl ], [/* elvis is alive */],
+dnl kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+dnl
@@ -91,25 +138,54 @@
+dnl ]
+dnl )
+dnl
-+dnl if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+dnl CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+dnl KDE_CHECK_VISIBILITY_GCC_BUG
+dnl HAVE_GCC_VISIBILITY=1
+dnl AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+dnl fi
+dnl ])
++dnl fi
+ ])
+
+ AC_DEFUN([KDE_ADD_DEPENDENCIES],
+@@ -5907,30 +5895,15 @@
fi
])
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## 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.
-@@ -5795,6 +5783,7 @@
- ## the same distribution terms that you use for the rest of that program.
+-# serial 47 AC_PROG_LIBTOOL
++# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
- # serial 47 AC_PROG_LIBTOOL
-+# Debian $Rev: 214 $
-
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5854,7 +5843,7 @@
+@@ -5990,7 +5963,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -118,9 +194,107 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6268,12 +6257,11 @@
+@@ -6040,7 +6013,7 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+ # Same as above, but do not quote variable references.
+@@ -6060,7 +6033,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -6108,6 +6081,8 @@
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -6153,6 +6128,48 @@
+ ])# _LT_AC_SYS_COMPILER
+
+
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++ case $cc_temp in
++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -6225,15 +6242,15 @@
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+- echo_test_string="`eval $cmd`" &&
++ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++ echo_test_string=`eval $cmd` &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+ then
+ break
+@@ -6402,14 +6419,13 @@
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- case "`/usr/bin/file conftest.o`" in
+- case "`/usr/bin/file conftest.o`" in
++ case `/usr/bin/file conftest.o` in
*32-bit*)
- LINUX_64_MODE="32"
case $host in
@@ -132,7 +306,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6285,7 +6273,6 @@
+@@ -6421,7 +6437,6 @@
esac
;;
*64-bit*)
@@ -140,7 +314,47 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6415,7 +6402,7 @@
+@@ -6486,7 +6501,7 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -6496,8 +6511,10 @@
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ fi
+@@ -6523,11 +6540,16 @@
+ LDFLAGS="$LDFLAGS $3"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The compiler can only warn and ignore the option if not recognized
++ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
++ $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ $2=yes
++ fi
+ else
+ $2=yes
+ fi
+@@ -6551,7 +6573,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -149,24 +363,52 @@
case $build_os in
msdosdjgpp*)
-@@ -6444,20 +6431,26 @@
+@@ -6580,20 +6602,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
+- *)
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
- *)
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
++ fi
++ # And add a safety zone
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ ;;
++ osf*)
++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++ # nice to cause kernel panics so lets avoid the loop below.
++ # First set a reasonable default.
++ lt_cv_sys_max_cmd_len=16384
++ #
++ if test -x /sbin/sysconfig; then
++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++ *1*) lt_cv_sys_max_cmd_len=-1 ;;
++ esac
++ fi
++ ;;
++ *)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
- = "XX$testring") >/dev/null 2>&1 &&
- new_result=`expr "X$testring" : ".*" 2>&1` &&
-+ while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
lt_cv_sys_max_cmd_len=$new_result &&
@@ -181,7 +423,16 @@
# 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.
-@@ -6607,7 +6600,7 @@
+@@ -6689,7 +6744,7 @@
+ }]
+ EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) $1 ;;
+@@ -6743,7 +6798,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -190,7 +441,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6696,13 +6689,6 @@
+@@ -6832,20 +6887,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -204,12 +455,29 @@
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.
-@@ -6726,8 +6712,11 @@
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -6857,13 +6905,18 @@
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
fi
fi
- chmod u+w .
+- chmod u+w .
- $rm conftest* out/*
- rmdir out
++ chmod u+w . 2>&AS_MESSAGE_LOG_FD
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
@@ -218,7 +486,18 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6844,7 +6833,7 @@
+@@ -6922,8 +6975,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -6980,7 +7033,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -227,7 +506,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6857,7 +6846,7 @@
+@@ -6993,7 +7046,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -236,7 +515,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6867,7 +6856,20 @@
+@@ -7003,7 +7056,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -258,7 +537,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6932,7 +6934,7 @@
+@@ -7068,7 +7134,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -267,8 +546,17 @@
;;
beos*)
-@@ -6957,7 +6959,7 @@
+@@ -7077,7 +7143,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+-bsdi4*)
++bsdi[[45]]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -7093,7 +7159,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -276,34 +564,85 @@
need_version=no
need_lib_prefix=no
-@@ -7022,7 +7024,7 @@
+@@ -7105,7 +7171,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -7135,7 +7202,7 @@
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -7158,7 +7225,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# 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"`
-@@ -7045,7 +7047,7 @@
+@@ -7181,7 +7248,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7105,7 +7107,7 @@
+@@ -7193,8 +7260,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[[123]]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -7212,7 +7288,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.[01]* | freebsdelf3.[01]*)
++ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -7239,9 +7315,9 @@
+ version_type=sunos
+ need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7120,7 +7122,7 @@
+@@ -7256,7 +7332,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -312,7 +651,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7131,7 +7133,7 @@
+@@ -7267,7 +7343,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -321,7 +660,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7193,22 +7195,19 @@
+@@ -7329,22 +7405,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'
@@ -343,14 +682,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# 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,
-@@ -7218,6 +7217,30 @@
+@@ -7354,6 +7427,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -381,7 +720,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7227,7 +7250,7 @@
+@@ -7363,7 +7460,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -390,16 +729,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7256,7 +7279,7 @@
+@@ -7392,7 +7489,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-+ need_version=yes
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
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
-@@ -7276,7 +7299,7 @@
+@@ -7412,7 +7513,7 @@
os2*)
libname_spec='$name'
@@ -408,9 +751,80 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7867,31 +7890,23 @@
+@@ -7558,7 +7659,9 @@
+
+ case $tagname in
+ CXX)
+- if test -n "$CXX" && test "X$CXX" != "Xno"; then
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
+ AC_LIBTOOL_LANG_CXX_CONFIG
+ else
+ tagname=""
+@@ -7620,7 +7723,7 @@
+
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -7794,7 +7897,7 @@
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+@@ -7904,7 +8007,7 @@
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
++ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -7936,7 +8039,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+@@ -7963,6 +8066,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++ darwin*)
++ if test "$GCC" = yes; then
++ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
++ ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+
+
+@@ -7996,44 +8108,36 @@
+ lt_cv_deplibs_check_method=pass_all
;;
+-bsdi4*)
++bsdi[[45]]*)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
cygwin*)
- lt_cv_deplibs_check_method=pass_all
+ # func_win32_libid is a shell function defined in ltmain.sh
@@ -444,12 +858,28 @@
lt_cv_deplibs_check_method=pass_all
;;
--freebsd*)
-+freebsd* | kfreebsd*-gnu)
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7930,42 +7945,21 @@
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+@@ -8049,7 +8153,7 @@
+
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -8066,42 +8170,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -499,9 +929,21 @@
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
-@@ -7994,9 +7988,6 @@
+@@ -8120,19 +8203,14 @@
;;
+ openbsd*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
+ ;;
+
osf3* | osf4* | osf5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -509,7 +951,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -8006,7 +7997,6 @@
+@@ -8142,7 +8220,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -517,7 +959,83 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8272,7 +8262,7 @@
+@@ -8250,13 +8327,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!). If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!). If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ case $enable_ltdl_convenience in
+@@ -8275,13 +8352,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!). If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!). If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -8319,10 +8396,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+
++# _LT_AC_PROG_CXXCPP
++# ---------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -8395,6 +8483,10 @@
+
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -8408,7 +8500,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 +1044,16 @@
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
-@@ -8322,7 +8312,7 @@
+@@ -8449,7 +8541,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -8458,48 +8550,11 @@
fi
;;
@@ -535,62 +1062,87 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8332,29 +8322,29 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
+- ;;
+- darwin* | rhapsody*)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- else
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+ ;;
-+ esac
- fi
- ;;
- esac
- output_verbose_link_cmd='echo'
+- fi
+- ;;
+- esac
+- output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8362,8 +8352,8 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+ fi
+ ;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8471,8 +8461,8 @@
+@@ -8524,7 +8579,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -8553,7 +8608,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -8568,6 +8623,10 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -8589,7 +8648,7 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -8607,8 +8666,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 +1153,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8498,7 +8488,7 @@
+@@ -8634,7 +8693,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 +1162,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8528,8 +8518,22 @@
+@@ -8664,8 +8723,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -635,7 +1187,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8575,15 +8579,16 @@
+@@ -8682,7 +8755,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GXX" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -8703,6 +8776,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -8711,15 +8787,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -656,7 +1227,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.
-@@ -8592,13 +8597,12 @@
+@@ -8728,13 +8805,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -672,16 +1243,23 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8613,7 +8617,7 @@
+@@ -8748,8 +8824,8 @@
+ # Exported symbols can be pulled into shared objects from archives
_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.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -8630,12 +8634,12 @@
+@@ -8762,16 +8838,17 @@
+ esac
+ ;;
+
++
+ cygwin* | mingw* | pw32*)
# _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 +1274,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
-@@ -8644,7 +8648,7 @@
+@@ -8780,70 +8857,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -705,87 +1283,170 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8655,20 +8659,20 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
+ ;;
++ darwin* | rhapsody*)
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- darwin* | rhapsody*)
+- if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- else
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+ ;;
-+ esac
++ if test "$GXX" = yes ; then
++ lt_int_apple_cc_single_mod=no
++ output_verbose_link_cmd='echo'
++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++ lt_int_apple_cc_single_mod=yes
fi
- ;;
- esac
-@@ -8678,19 +8682,19 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8725,7 +8729,7 @@
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ fi
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ fi
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
++ fi
++ ;;
+
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -8854,14 +8942,14 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[[12]]*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8747,7 +8751,7 @@
+@@ -8878,12 +8966,12 @@
+ # location of the library.
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aCC)
+- aCC)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ aCC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8756,11 +8760,11 @@
+@@ -8892,11 +8980,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.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
*)
if test "$GXX" = yes; then
@@ -794,7 +1455,38 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8817,7 +8821,7 @@
+@@ -8906,7 +8994,7 @@
+ ;;
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -8922,7 +9010,7 @@
+ ;;
+ esac
+ fi
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -8943,17 +9031,17 @@
+ esac
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aCC)
+- case "$host_cpu" in
++ aCC*)
++ case $host_cpu in
+ hppa*64*|ia64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -803,7 +1495,13 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8838,7 +8842,7 @@
+@@ -8969,12 +9057,12 @@
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*|hppa*64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -812,28 +1510,38 @@
;;
esac
fi
-@@ -8853,7 +8857,7 @@
+@@ -8987,9 +9075,9 @@
+ ;;
+ irix5* | irix6*)
case $cc_basename in
- CC)
+- CC)
++ CC*)
# SGI C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8864,9 +8868,9 @@
+@@ -9000,9 +9088,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8883,8 +8887,8 @@
+@@ -9013,14 +9101,14 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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,19 +1552,49 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8906,16 +8910,16 @@
+@@ -9038,20 +9126,44 @@
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+- icpc)
++ icpc*)
# Intel C++
with_gnu_ld=yes
++ # version 8.0 and above of icpc choke on multiply defined symbols
++ # if we add $predep_objects and $postdep_objects, however 7.1 and
++ # earlier do not add the objects themselves.
++ case `$CC -V 2>&1` in
++ *"Version 7."*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ *) # Version 8.0 or newer
++ tmp_idyn=
++ case $host_cpu in
++ ia64*) tmp_idyn=' -i_dynamic';;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
+- cxx)
++ pgCC*)
++ # Portland Group C++ compiler
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ ;;
++ cxx*)
# Compaq C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -865,8 +1603,17 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8953,7 +8957,7 @@
+@@ -9079,7 +9191,7 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
+@@ -9089,7 +9201,7 @@
+ ;;
esac
;;
- netbsd*)
@@ -874,7 +1621,32 @@
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=
-@@ -8972,7 +8976,7 @@
+@@ -9100,15 +9212,31 @@
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
++ openbsd2*)
++ # C++ shared libraries are fairly broken
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ openbsd*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ ;;
+ osf3*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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,25 +1655,41 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8989,7 +8993,7 @@
+@@ -9118,14 +9246,14 @@
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
;;
- cxx)
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9007,7 +9011,7 @@
+@@ -9143,7 +9271,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9032,7 +9036,7 @@
+@@ -9162,13 +9290,13 @@
+ ;;
+ osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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,50 +1698,123 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9048,10 +9052,10 @@
+@@ -9177,17 +9305,17 @@
+ # the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
- cxx)
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
-+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9070,7 +9074,7 @@
+@@ -9206,7 +9334,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9127,9 +9131,9 @@
- CC)
+@@ -9230,7 +9358,7 @@
+ sco*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+@@ -9242,12 +9370,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -9260,36 +9388,33 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_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~
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9163,7 +9167,7 @@
+ case $host_os in
+- solaris2.[0-5] | solaris2.[0-5].*) ;;
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The C++ compiler is used as linker so we must use $wl
+ # flag to pass the commands to the underlying system
+- # linker.
++ # linker. We must also pass each convience library through
++ # to the system linker between allextract/defaultextract.
++ # The C++ compiler will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # 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.
+- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -9297,9 +9422,9 @@
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
- gcx)
+- gcx)
++ gcx*)
# Green Hills C++ Compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9173,9 +9177,9 @@
+@@ -9309,9 +9434,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 +1826,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9184,9 +9188,9 @@
+@@ -9320,9 +9445,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -977,7 +1838,25 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9354,7 +9358,7 @@
+@@ -9340,7 +9465,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -9450,7 +9575,7 @@
+ # The `*' in the case matches for architectures that use `case' in
+ # $output_verbose_cmd can trigger glob expansion during the loop
+ # eval without this substitution.
+- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+ for p in `eval $output_verbose_link_cmd`; do
+ case $p in
+@@ -9490,7 +9615,7 @@
fi
;;
@@ -986,16 +1865,115 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9463,7 +9467,7 @@
+@@ -9526,6 +9651,21 @@
+
+ $rm -f confest.$objext
+
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++solaris*)
++ case $cc_basename in
++ CC*)
++ # Adding this requires a known-good setup of shared libraries for
++ # Sun compiler versions before 5.6, else PIC objects from an old
++ # archive will be linked into the output, leading to subtle bugs.
++ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++ ;;
++ esac
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -9576,12 +9716,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -9591,7 +9735,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -9599,8 +9743,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
+- test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
- test "$enable_shared" = yes && enable_static=no
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
;;
esac
-@@ -9605,11 +9609,12 @@
+ AC_MSG_RESULT([$enable_shared])
+@@ -9651,20 +9797,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -9711,11 +9864,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+ AC_LIBTOOL_CONFIG($1)
+@@ -9741,11 +9899,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1010,7 +1988,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 \
-@@ -9659,7 +9664,7 @@
+@@ -9795,7 +9954,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1019,7 +1997,34 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9790,7 +9795,7 @@
+@@ -9861,11 +10020,11 @@
+ SED=$lt_SED
+
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -9896,6 +10055,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -9926,7 +10091,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1028,7 +2033,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9821,7 +9826,7 @@
+@@ -9957,7 +10122,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1037,7 +2042,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10065,7 +10070,10 @@
+@@ -9972,7 +10137,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -10201,7 +10366,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 +2063,31 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10138,7 +10146,7 @@
+@@ -10243,9 +10411,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+@@ -10267,6 +10432,13 @@
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ ;;
++linux*)
++ if test "$host_cpu" = ia64; then
++ symcode='[[ABCDGIRSTW]]'
++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
++ fi
++ ;;
+ irix* | nonstopux*)
+ symcode='[[BCDEGRST]]'
+ ;;
+@@ -10274,7 +10446,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1058,7 +2096,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10156,7 +10164,7 @@
+@@ -10292,14 +10464,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1067,26 +2105,133 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10371,7 +10379,7 @@
+ for ac_symprfx in "" "_"; do
+
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+ # Write the raw and C identifiers.
+- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -10463,7 +10638,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+@@ -10488,18 +10663,28 @@
+ ;;
+ chorus*)
+ case $cc_basename in
+- cxch68)
++ cxch68*)
+ # Green Hills C++ Compiler
+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ ;;
+ esac
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -10507,22 +10692,22 @@
+ ;;
esac
;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10422,7 +10430,7 @@
+ case $cc_basename in
+- CC)
++ CC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ fi
+ ;;
+- aCC)
++ aCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -10537,7 +10722,7 @@
+ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ # CC pic flag -KPIC is the default.
+@@ -10548,18 +10733,24 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # KAI C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+- icpc)
++ icpc* | ecpc*)
+ # Intel C++
+ _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'
- ;;
+- cxx)
+ ;;
- cxx)
++ pgCC*)
++ # Portland Group C++ compiler.
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ cxx*)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10447,7 +10455,7 @@
+ # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -10576,25 +10767,25 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
;;
+ *)
+ ;;
esac
;;
- netbsd*)
@@ -1094,17 +2239,175 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10758,6 +10766,9 @@
+- KCC)
++ KCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+- cxx)
++ cxx*)
+ # Digital/Compaq C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+@@ -10610,7 +10801,7 @@
+ ;;
+ sco*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ *)
+@@ -10619,13 +10810,13 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ ;;
+@@ -10635,12 +10826,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -10650,7 +10841,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+@@ -10721,7 +10912,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -10747,6 +10938,16 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -10758,7 +10959,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -10782,12 +10983,19 @@
+ ;;
+
+ linux*)
+- case $CC in
++ case $cc_basename in
+ icc* | ecc*)
+ _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'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
+ ccc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All Alpha code is PIC.
+@@ -10808,9 +11016,14 @@
+ ;;
+
+ solaris*)
+- _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)='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -10832,6 +11045,11 @@
+ fi
+ ;;
+
++ unicos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
++
+ uts4*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -10859,7 +11077,7 @@
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -10892,7 +11110,10 @@
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
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'
- ;;
+- _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'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ ;;
+ linux*)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
+ ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -10782,7 +10793,7 @@
+@@ -10918,7 +11139,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1113,7 +2416,45 @@
_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*
-@@ -10856,7 +10867,7 @@
+@@ -10935,7 +11156,8 @@
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ extract_expsyms_cmds=
+-
++ # Just being paranoid about ensuring that cc_basename is set.
++ _LT_CC_BASENAME([$compiler])
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -10955,6 +11177,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -10992,7 +11235,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 +2463,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10866,13 +10877,13 @@
+@@ -11002,13 +11245,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'
@@ -1130,7 +2471,8 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _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'
+- _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'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -1138,18 +2480,51 @@
# 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
-@@ -10881,19 +10892,19 @@
+@@ -11017,19 +11260,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
- ld_shlibs=no
+- ld_shlibs=no
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
- netbsd*)
++ linux*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -1162,7 +2537,7 @@
fi
;;
-@@ -10911,8 +10922,8 @@
+@@ -11047,8 +11322,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1173,36 +2548,8 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10925,10 +10936,36 @@
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
+@@ -11063,24 +11338,19 @@
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-+ fi
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -1212,7 +2559,28 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10978,9 +11015,20 @@
+ ;;
+ esac
+
+- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+- runpath_var=LD_RUN_PATH
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+- fi
++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++ runpath_var=
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -11114,9 +11384,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 +2603,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11026,29 +11074,29 @@
+@@ -11133,7 +11414,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -11154,6 +11435,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -11162,29 +11446,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1274,16 +2661,27 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11063,7 +11111,7 @@
+@@ -11198,8 +11482,8 @@
+ # Exported symbols can be pulled into shared objects from archives
_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.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -11086,13 +11134,13 @@
+@@ -11212,7 +11496,7 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+- bsdi4*)
++ bsdi[[45]]*)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+@@ -11222,69 +11506,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1300,88 +2698,117 @@
# 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.
-@@ -11106,21 +11154,21 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
+- ;;
+- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
-@@ -11129,26 +11177,26 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
+ fi
;;
dgux*)
-@@ -11181,8 +11229,8 @@
+@@ -11317,8 +11601,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_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
-@@ -11190,7 +11238,7 @@
+@@ -11326,7 +11610,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1390,9 +2817,12 @@
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
-@@ -11208,10 +11256,10 @@
+@@ -11342,16 +11626,16 @@
+
+ hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -1403,7 +2833,21 @@
;;
esac
else
-@@ -11258,7 +11306,7 @@
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -11361,7 +11645,7 @@
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -11394,7 +11678,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1412,7 +2856,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'
-@@ -11268,7 +11316,7 @@
+@@ -11404,7 +11688,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1421,16 +2865,17 @@
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
-@@ -11291,7 +11339,7 @@
+@@ -11427,7 +11711,8 @@
_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
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11301,7 +11349,7 @@
+@@ -11437,7 +11722,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1439,7 +2884,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11312,14 +11360,14 @@
+@@ -11448,14 +11733,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 +2901,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'
-@@ -11331,7 +11379,7 @@
+@@ -11467,13 +11752,13 @@
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,19 +2910,50 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11356,9 +11404,9 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -11492,10 +11777,12 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_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~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
++ wlarc=''
_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~
-@@ -11378,7 +11426,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -11504,8 +11791,18 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl, iff we do not link with $LD.
++ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ case $wlarc in
++ '')
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ esac ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+@@ -11514,7 +11811,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 +2962,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11438,9 +11486,9 @@
+@@ -11574,9 +11871,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1498,7 +2974,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11498,7 +11546,7 @@
+@@ -11634,7 +11931,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1507,16 +2983,15 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11657,8 +11705,8 @@
- fi
- done
- done
--])
- SED=$lt_cv_path_SED
-+])
- AC_MSG_RESULT([$SED])
- ])
-
+@@ -11768,7 +12065,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+- test ! -f $lt_ac_sed && break
++ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
--- aclocal.m4
+++ aclocal.m4
@@ -501,6 +501,35 @@
@@ -1557,7 +3032,7 @@
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- applnk/compat/Makefile.in
+++ applnk/compat/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1567,7 +3042,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -557,7 +560,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -1576,7 +3051,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -595,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1588,7 +3063,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -741,7 +744,7 @@
+@@ -757,7 +760,7 @@
.NOEXPORT:
#>+ 2
@@ -1599,7 +3074,7 @@
docs-am:
--- applnk/Makefile.in
+++ applnk/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1609,7 +3084,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -550,7 +553,7 @@
+@@ -566,7 +569,7 @@
SUBDIRS = compat
xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
xdg_mergedmenu_DATA = kde-essential.menu
@@ -1618,7 +3093,7 @@
xdg_directory_DATA = \
kde-main.directory \
kde-development.directory \
-@@ -598,7 +601,7 @@
+@@ -621,7 +624,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -1627,7 +3102,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -659,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1639,18 +3114,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -1001,7 +1004,7 @@
+@@ -1024,7 +1027,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-games.directory kde-games-arcade.directory kde-settings-accessibility.directory kde-settings-security.directory kde-settings-network.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-toys.directory kde-system-screensavers.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-games-card.directory kde-development.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory hidden.directory kde-graphics.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-science.directory kde-settings.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu Makefile.am kde-multimedia.directory kde-games-strategy.directory kde-settings-peripherals.directory
-+KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-games.directory kde-games-arcade.directory kde-settings-accessibility.directory kde-settings-network.directory kde-settings-security.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-system-screensavers.directory kde-toys.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-development.directory kde-games-card.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory hidden.directory kde-graphics.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-settings.directory kde-science.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-multimedia.directory Makefile.am kde-games-strategy.directory kde-settings-peripherals.directory
+-KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-utilities-file.directory kde-games-arcade.directory kde-games.directory kde-settings-accessibility.directory kde-settings-security.directory kde-utilities-accessibility.directory kde-settings-network.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-development-webdevelopment.directory kde-toys.directory kde-system-screensavers.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-games-card.directory kde-development.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory kde-utilities-desktop.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory hidden.directory kde-graphics.directory kde-development-translation.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-science.directory kde-settings.directory kde-utilities-peripherals.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-utilities-pim.directory Makefile.am kde-multimedia.directory kde-games-strategy.directory kde-settings-peripherals.directory
++KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-games.directory kde-utilities-file.directory kde-games-arcade.directory kde-settings-accessibility.directory kde-settings-network.directory kde-utilities-accessibility.directory kde-settings-security.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-development-webdevelopment.directory kde-system-screensavers.directory kde-toys.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-development.directory kde-games-card.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory kde-utilities-desktop.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory kde-graphics.directory hidden.directory kde-development-translation.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-utilities-peripherals.directory kde-settings.directory kde-science.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-utilities-pim.directory kde-multimedia.directory Makefile.am kde-games-strategy.directory kde-settings-peripherals.directory
#>+ 2
docs-am:
--- config.h.in
+++ config.h.in
-@@ -912,9 +912,6 @@
+@@ -927,9 +927,6 @@
#endif
@@ -1662,12 +3137,31 @@
#define __svr4__ 1
--- configure
+++ configure
+@@ -278,15 +278,15 @@
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+- echo_test_string="`eval $cmd`" &&
++ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++ echo_test_string=`eval $cmd` &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+ then
+ break
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_KVM SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE HAL_INCS HAL_LIBS DBUS_INCS DBUS_LIBS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_halbackend_TRUE include_media_halbackend_FALSE include_kioslave_smb_TRUE include_kioslave_smb_FALSE SMBCLIENT_EXTRA_LIBS PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIBHOSTS include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_KVM SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE HAL_INCS HAL_LIBS DBUS_INCS DBUS_LIBS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_halbackend_TRUE include_media_halbackend_FALSE include_kioslave_smb_TRUE include_kioslave_smb_FALSE SMBCLIENT_EXTRA_LIBS PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIBHOSTS include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_ARTS ARTS_CFLAGS LIB_KVM LIB_XCOMPOSITE LIB_XFIXES SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIB_LBER LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING PKG_CONFIG HAL_CFLAGS HAL_LIBS HAL_INCS DBUS_CFLAGS DBUS_LIBS DBUS_INCS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE include_media_halbackend_TRUE include_media_halbackend_FALSE SMBCLIENT_EXTRA_LIBS include_kioslave_smb_TRUE include_kioslave_smb_FALSE LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBHOSTS LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdeeject_SUBDIR_included_TRUE kdeeject_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_ARTS ARTS_CFLAGS LIB_KVM LIB_XCOMPOSITE LIB_XFIXES SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIB_LBER LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING PKG_CONFIG HAL_CFLAGS HAL_LIBS HAL_INCS DBUS_CFLAGS DBUS_LIBS DBUS_INCS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE include_media_halbackend_TRUE include_media_halbackend_FALSE SMBCLIENT_EXTRA_LIBS include_kioslave_smb_TRUE include_kioslave_smb_FALSE LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBHOSTS LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdeeject_SUBDIR_included_TRUE kdeeject_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1680,7 +3174,7 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -1202,7 +1204,7 @@
+@@ -1211,7 +1213,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -1689,10 +3183,19 @@
done
fi
-@@ -2105,6 +2107,31 @@
+@@ -1983,7 +1985,7 @@
+ # Define the identity of the package.
+- PACKAGE=kdebase
++ PACKAGE=kdebase.0
+ VERSION="3.5"
+
+@@ -2114,6 +2116,31 @@
+
+
+
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -1721,7 +3224,7 @@
unset CDPATH
-@@ -3038,8 +3065,7 @@
+@@ -3047,8 +3074,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1731,7 +3234,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3097,8 +3123,7 @@
+@@ -3106,8 +3132,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1741,7 +3244,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3214,8 +3239,7 @@
+@@ -3223,8 +3248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1751,7 +3254,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3269,8 +3293,7 @@
+@@ -3278,8 +3302,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1761,7 +3264,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3315,8 +3338,7 @@
+@@ -3324,8 +3347,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1771,7 +3274,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3360,8 +3382,7 @@
+@@ -3369,8 +3391,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1781,7 +3284,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3918,8 +3939,7 @@
+@@ -3927,8 +3948,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1791,7 +3294,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3977,8 +3997,7 @@
+@@ -3986,8 +4006,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1801,7 +3304,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4049,8 +4068,7 @@
+@@ -4058,8 +4077,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1811,7 +3314,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4094,8 +4112,7 @@
+@@ -4103,8 +4121,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1821,7 +3324,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4273,8 +4290,7 @@
+@@ -4282,8 +4299,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1831,7 +3334,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4385,8 +4401,7 @@
+@@ -4394,8 +4410,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1841,7 +3344,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4474,8 +4489,7 @@
+@@ -4483,8 +4498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1851,7 +3354,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4577,8 +4591,7 @@
+@@ -4586,8 +4600,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1861,7 +3364,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4677,8 +4690,7 @@
+@@ -4686,8 +4699,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1871,7 +3374,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4762,8 +4774,7 @@
+@@ -4771,8 +4783,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1881,7 +3384,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4852,8 +4863,7 @@
+@@ -4861,8 +4872,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1891,7 +3394,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4940,8 +4950,7 @@
+@@ -4949,8 +4959,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1901,7 +3404,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5028,8 +5037,7 @@
+@@ -5037,8 +5046,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1911,7 +3414,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5135,8 +5143,7 @@
+@@ -5144,8 +5152,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1921,7 +3424,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5223,8 +5230,7 @@
+@@ -5232,8 +5239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1931,7 +3434,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5311,8 +5317,7 @@
+@@ -5320,8 +5326,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1941,7 +3444,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5399,8 +5404,7 @@
+@@ -5408,8 +5413,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1951,7 +3454,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5531,8 +5535,7 @@
+@@ -5540,8 +5544,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1961,7 +3464,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5620,8 +5623,7 @@
+@@ -5629,8 +5632,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1971,7 +3474,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5708,8 +5710,7 @@
+@@ -5717,8 +5719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1981,7 +3484,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5796,8 +5797,7 @@
+@@ -5805,8 +5806,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -1991,7 +3494,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5884,8 +5884,7 @@
+@@ -5893,8 +5893,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2001,7 +3504,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5972,8 +5971,7 @@
+@@ -5981,8 +5980,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2011,7 +3514,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6396,8 +6394,7 @@
+@@ -6405,8 +6403,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2021,7 +3524,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6523,8 +6520,7 @@
+@@ -6532,8 +6529,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2031,7 +3534,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6612,8 +6608,7 @@
+@@ -6621,8 +6617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2041,7 +3544,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6696,185 +6691,6 @@
+@@ -6705,185 +6700,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -2227,19 +3730,58 @@
fi
-@@ -7063,10 +6879,10 @@
- fi
- done
- done
-+SED=$lt_cv_path_SED
+@@ -7047,7 +6863,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+- test ! -f $lt_ac_sed && break
++ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+@@ -7152,7 +6968,7 @@
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
++ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -7186,7 +7002,7 @@
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+@@ -7216,6 +7032,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++ darwin*)
++ if test "$GCC" = yes; then
++ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
++ ;;
++esac
- fi
+ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+ echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+@@ -7302,44 +7127,36 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
--SED=$lt_cv_path_SED
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
-
-@@ -7300,31 +7116,23 @@
+-bsdi4*)
++bsdi[45]*)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
;;
cygwin*)
@@ -2274,12 +3816,28 @@
lt_cv_deplibs_check_method=pass_all
;;
--freebsd*)
-+freebsd* | kfreebsd*-gnu)
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7363,42 +7171,21 @@
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+@@ -7355,7 +7172,7 @@
+
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -7372,42 +7189,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -2329,9 +3887,21 @@
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
-@@ -7427,9 +7214,6 @@
+@@ -7426,19 +7222,14 @@
;;
+ openbsd*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+ else
+- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ fi
+ ;;
+
osf3* | osf4* | osf5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -2339,7 +3909,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7439,7 +7223,6 @@
+@@ -7448,7 +7239,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -2347,18 +3917,21 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7516,7 +7299,7 @@
+@@ -7525,7 +7315,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7519 "configure"' > conftest.$ac_ext
-+ echo '#line 7302 "configure"' > conftest.$ac_ext
+- echo '#line 7528 "configure"' > conftest.$ac_ext
++ echo '#line 7318 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7561,12 +7344,11 @@
+@@ -7568,14 +7358,13 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- case "`/usr/bin/file conftest.o`" in
+- case "`/usr/bin/file conftest.o`" in
++ case `/usr/bin/file conftest.o` in
*32-bit*)
- LINUX_64_MODE="32"
case $host in
@@ -2370,7 +3943,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7578,7 +7360,6 @@
+@@ -7587,7 +7376,6 @@
esac
;;
*64-bit*)
@@ -2378,7 +3951,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7638,8 +7419,7 @@
+@@ -7647,8 +7435,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2388,7 +3961,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7714,8 +7494,7 @@
+@@ -7723,8 +7510,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2398,7 +3971,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7885,8 +7664,7 @@
+@@ -7894,8 +7680,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2408,7 +3981,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7953,8 +7731,7 @@
+@@ -7962,8 +7747,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2418,16 +3991,260 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8161,7 +7938,7 @@
+@@ -8078,6 +7862,243 @@
+ done
++
++
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++if test -z "$CXXCPP"; then
++ if test "${ac_cv_prog_CXXCPP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # Double quotes because CXXCPP needs to be expanded
++ for CXXCPP in "$CXX -E" "/lib/cpp"
++ do
++ ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_cxx_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether non-existent headers
++ # can be detected and how.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_cxx_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ # Broken: success on invalid input.
++continue
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++ break
++fi
++
++ done
++ ac_cv_prog_CXXCPP=$CXXCPP
++
++fi
++ CXXCPP=$ac_cv_prog_CXXCPP
++else
++ ac_cv_prog_CXXCPP=$CXXCPP
++fi
++echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6
++ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_cxx_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether non-existent headers
++ # can be detected and how.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_cxx_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ # Broken: success on invalid input.
++continue
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++ :
++else
++ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++fi
++
+ ac_ext=f
+ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -8170,7 +8191,7 @@
+
+
# Provide some information about the compiler.
--echo "$as_me:8164:" \
-+echo "$as_me:7941:" \
+-echo "$as_me:8173:" \
++echo "$as_me:8194:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8207,8 +7984,7 @@
+@@ -8216,8 +8237,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2437,7 +4254,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8257,8 +8033,7 @@
+@@ -8266,8 +8286,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2447,7 +4264,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8316,7 +8091,7 @@
+@@ -8325,7 +8344,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -2456,24 +4273,52 @@
case $build_os in
msdosdjgpp*)
-@@ -8345,20 +8120,26 @@
+@@ -8354,20 +8373,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
+- *)
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
- *)
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
++ fi
++ # And add a safety zone
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ ;;
++ osf*)
++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++ # nice to cause kernel panics so lets avoid the loop below.
++ # First set a reasonable default.
++ lt_cv_sys_max_cmd_len=16384
++ #
++ if test -x /sbin/sysconfig; then
++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++ *1*) lt_cv_sys_max_cmd_len=-1 ;;
++ esac
++ fi
++ ;;
++ *)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
- = "XX$testring") >/dev/null 2>&1 &&
- new_result=`expr "X$testring" : ".*" 2>&1` &&
-+ while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
lt_cv_sys_max_cmd_len=$new_result &&
@@ -2488,7 +4333,31 @@
# 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.
-@@ -8426,7 +8207,7 @@
+@@ -8404,9 +8456,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+@@ -8428,6 +8477,13 @@
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ ;;
++linux*)
++ if test "$host_cpu" = ia64; then
++ symcode='[ABCDGIRSTW]'
++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
++ fi
++ ;;
+ irix* | nonstopux*)
+ symcode='[BCDEGRST]'
+ ;;
+@@ -8435,7 +8491,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -2497,7 +4366,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8444,7 +8225,7 @@
+@@ -8453,14 +8509,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2506,35 +4375,256 @@
esac
# Try without a prefix undercore, then with it.
-@@ -9193,11 +8974,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ for ac_symprfx in "" "_"; do
+
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+ # Write the raw and C identifiers.
+- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -8622,7 +8681,7 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+
+ # Same as above, but do not quote variable references.
+@@ -8642,7 +8701,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -8927,6 +8986,17 @@
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -8952,7 +9022,7 @@
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+@@ -9014,7 +9084,7 @@
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+@@ -9113,6 +9183,20 @@
+ compiler=$CC
+
+
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -9149,11 +9233,16 @@
+ LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The compiler can only warn and ignore the option if not recognized
++ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
++ $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_prog_compiler_static_works=yes
++ fi
+ else
+ lt_prog_compiler_static_works=yes
+ fi
+@@ -9199,18 +9288,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9196: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8977: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9205: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9294: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9200: \$? = $ac_status" >&5
-+ echo "$as_me:8981: \$? = $ac_status" >&5
+- echo "$as_me:9209: \$? = $ac_status" >&5
++ echo "$as_me:9298: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -9426,11 +9207,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_rtti_exceptions=yes
+ fi
+ fi
+@@ -9287,7 +9378,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -9313,6 +9404,16 @@
+ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ lt_prog_compiler_pic='-qnocommon'
++ lt_prog_compiler_wl='-Wl,'
++ ;;
++ esac
++ ;;
+
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -9324,7 +9425,7 @@
+ lt_prog_compiler_wl='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -9348,12 +9449,19 @@
+ ;;
+
+ linux*)
+- case $CC in
++ case $cc_basename in
+ icc* | ecc*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-static'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_pic='-fpic'
++ lt_prog_compiler_static='-Bstatic'
++ ;;
+ ccc*)
+ lt_prog_compiler_wl='-Wl,'
+ # All Alpha code is PIC.
+@@ -9374,9 +9482,14 @@
+ ;;
+
+ solaris*)
+- lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ lt_prog_compiler_wl='-Qoption ld ';;
++ *)
++ lt_prog_compiler_wl='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -9398,6 +9511,11 @@
+ fi
+ ;;
+
++ unicos*)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_can_build_shared=no
++ ;;
++
+ uts4*)
+ lt_prog_compiler_pic='-pic'
+ lt_prog_compiler_static='-Bstatic'
+@@ -9432,18 +9550,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9429: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9210: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9438: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9556: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9433: \$? = $ac_status" >&5
-+ echo "$as_me:9214: \$? = $ac_status" >&5
+- echo "$as_me:9442: \$? = $ac_status" >&5
++ echo "$as_me:9560: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -9477,13 +9258,6 @@
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_pic_works=yes
+ fi
+ fi
+@@ -9464,7 +9584,7 @@
+ fi
+
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic=
+@@ -9486,38 +9606,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2548,26 +4638,35 @@
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.
-@@ -9493,11 +9267,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9496: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9270: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9505: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9618: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9500: \$? = $ac_status" >&5
-+ echo "$as_me:9274: \$? = $ac_status" >&5
+- echo "$as_me:9509: \$? = $ac_status" >&5
++ echo "$as_me:9622: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9507,8 +9281,11 @@
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
fi
fi
- chmod u+w .
+- chmod u+w .
- $rm conftest* out/*
- rmdir out
++ chmod u+w . 2>&5
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
@@ -2576,7 +4675,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9636,7 +9413,7 @@
+@@ -9588,6 +9706,16 @@
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ extract_expsyms_cmds=
++ # Just being paranoid about ensuring that cc_basename is set.
++ for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+@@ -9608,6 +9736,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++ export_dynamic_flag_spec='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ whole_archive_flag_spec=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -9645,7 +9794,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -2585,7 +4729,7 @@
else
ld_shlibs=no
fi
-@@ -9646,13 +9423,13 @@
+@@ -9655,13 +9804,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -2593,7 +4737,8 @@
+ allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -2601,7 +4746,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9661,19 +9438,19 @@
+@@ -9670,19 +9819,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -2613,6 +4758,38 @@
;;
- netbsd*)
++ linux*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ link_all_deplibs=no
++ else
++ ld_shlibs=no
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -2625,7 +4802,7 @@
fi
;;
-@@ -9691,8 +9468,8 @@
+@@ -9700,8 +9881,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2636,36 +4813,8 @@
else
ld_shlibs=no
fi
-@@ -9705,10 +9482,36 @@
- hardcode_shlibpath_var=no
- ;;
+@@ -9716,24 +9897,19 @@
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_cmds="$tmp_archive_cmds"
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ archive_expsym_cmds="$tmp_archive_cmds"
-+ fi
-+ link_all_deplibs=no
-+ else
-+ ld_shlibs=no
-+ fi
-+ ;;
-+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -2675,7 +4824,28 @@
else
ld_shlibs=no
fi
-@@ -9758,9 +9561,20 @@
+ ;;
+ esac
+
+- if test "$ld_shlibs" = yes; then
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+- export_dynamic_flag_spec='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- whole_archive_flag_spec=
+- fi
++ if test "$ld_shlibs" = no; then
++ runpath_var=
++ hardcode_libdir_flag_spec=
++ export_dynamic_flag_spec=
++ whole_archive_flag_spec=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -9767,9 +9943,20 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -2698,7 +4868,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9806,21 +9620,22 @@
+@@ -9786,7 +9973,7 @@
+ link_all_deplibs=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.012|aix4.012.*)
++ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -9807,6 +9994,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -9815,21 +10005,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -2726,7 +4915,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9844,8 +9659,7 @@
+@@ -9853,8 +10044,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2736,7 +4925,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9872,14 +9686,13 @@
+@@ -9881,14 +10071,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -2754,7 +4943,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9906,8 +9719,7 @@
+@@ -9915,8 +10104,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2764,16 +4953,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9945,7 +9757,7 @@
+@@ -9953,8 +10141,8 @@
+ # Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -9968,13 +9780,13 @@
+@@ -9967,7 +10155,7 @@
+ ld_shlibs=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec=-rdynamic
+ ;;
+
+@@ -9977,13 +10165,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -2790,14 +4990,17 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9988,21 +9800,21 @@
- archive_cmds_need_lc=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+@@ -9993,52 +10181,52 @@
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- archive_cmds_need_lc=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
- allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
+- ;;
+- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
@@ -2810,58 +5013,88 @@
- ;;
- esac
- fi
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag='-flat_namespace -undefined suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag='-undefined dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[012])
++ allow_undefined_flag='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
-@@ -10011,18 +9823,18 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_need_lc=no
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -10063,8 +9875,8 @@
+- whole_archive_flag_spec='-all_load $convenience'
++ whole_archive_flag_spec=''
+ link_all_deplibs=yes
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+- ld_shlibs=no
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ ld_shlibs=no
++ ;;
++ esac
+ fi
;;
+@@ -10072,8 +10260,8 @@
+ ;;
+
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10072,7 +9884,7 @@
+@@ -10081,7 +10269,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -2870,9 +5103,12 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -10090,10 +9902,10 @@
+@@ -10097,16 +10285,16 @@
+
+ hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
hppa*64*|ia64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -2883,7 +5119,21 @@
;;
esac
else
-@@ -10140,7 +9952,7 @@
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -10116,7 +10304,7 @@
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld='+b $libdir'
+@@ -10149,7 +10337,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -2892,7 +5142,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10150,7 +9962,7 @@
+@@ -10159,7 +10347,7 @@
link_all_deplibs=yes
;;
@@ -2901,16 +5151,17 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10173,7 +9985,7 @@
+@@ -10182,7 +10370,8 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10183,7 +9995,7 @@
+@@ -10192,7 +10381,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -2919,7 +5170,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10194,14 +10006,14 @@
+@@ -10203,14 +10392,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -2936,7 +5187,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10213,7 +10025,7 @@
+@@ -10222,13 +10411,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -2945,19 +5196,50 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -10238,9 +10050,9 @@
+ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -10247,10 +10436,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
++ wlarc=''
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -10260,7 +10072,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -10259,8 +10450,18 @@
+ hardcode_shlibpath_var=no
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl, iff we do not link with $LD.
++ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ case $wlarc in
++ '')
++ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++ *)
++ whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ esac ;;
+ esac
+ link_all_deplibs=yes
+ ;;
+@@ -10269,7 +10470,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.
@@ -2966,7 +5248,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10320,9 +10132,9 @@
+@@ -10329,9 +10530,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -2978,7 +5260,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10428,7 +10240,7 @@
+@@ -10437,7 +10638,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -2987,7 +5269,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10438,7 +10250,20 @@
+@@ -10447,7 +10648,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3009,7 +5291,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10503,7 +10328,7 @@
+@@ -10512,7 +10726,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -3018,8 +5300,17 @@
;;
beos*)
-@@ -10528,7 +10353,7 @@
+@@ -10521,7 +10735,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+-bsdi4*)
++bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10537,7 +10751,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -3027,34 +5318,85 @@
need_version=no
need_lib_prefix=no
-@@ -10593,7 +10418,7 @@
+@@ -10549,7 +10763,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -10579,7 +10794,7 @@
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -10602,7 +10817,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# 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"`
-@@ -10616,7 +10441,7 @@
+@@ -10625,7 +10840,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10676,7 +10501,7 @@
+@@ -10637,8 +10852,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[123]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -10656,7 +10880,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -10683,9 +10907,9 @@
+ version_type=sunos
+ need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10691,7 +10516,7 @@
+@@ -10700,7 +10924,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -3063,7 +5405,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10702,7 +10527,7 @@
+@@ -10711,7 +10935,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -3072,7 +5414,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10764,22 +10589,19 @@
+@@ -10773,22 +10997,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'
@@ -3094,14 +5436,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# 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,
-@@ -10789,6 +10611,30 @@
+@@ -10798,6 +11019,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3132,7 +5474,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10798,7 +10644,7 @@
+@@ -10807,7 +11052,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -3141,16 +5483,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10827,7 +10673,7 @@
+@@ -10836,7 +11081,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-+ need_version=yes
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
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
-@@ -10847,7 +10693,7 @@
+@@ -10856,7 +11105,7 @@
os2*)
libname_spec='$name'
@@ -3159,7 +5505,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11076,8 +10922,7 @@
+@@ -10958,8 +11207,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" || \
+- test -n "$runpath_var " || \
+- test "X$hardcode_automatic"="Xyes" ; then
++ test -n "$runpath_var" || \
++ test "X$hardcode_automatic" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct" != no &&
+@@ -11085,8 +11334,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3169,7 +5526,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11180,8 +11025,7 @@
+@@ -11189,8 +11437,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3179,7 +5536,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11246,8 +11090,7 @@
+@@ -11255,8 +11502,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3189,7 +5546,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11340,8 +11183,7 @@
+@@ -11349,8 +11595,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3199,7 +5556,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11406,8 +11248,7 @@
+@@ -11415,8 +11660,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3209,7 +5566,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11473,8 +11314,7 @@
+@@ -11482,8 +11726,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3219,7 +5576,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11540,8 +11380,7 @@
+@@ -11549,8 +11792,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3229,25 +5586,52 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11616,7 +11455,7 @@
+@@ -11625,7 +11867,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11619 "configure"
-+#line 11458 "configure"
+-#line 11628 "configure"
++#line 11870 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11714,7 +11553,7 @@
+@@ -11691,7 +11933,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+@@ -11723,7 +11965,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11717 "configure"
-+#line 11556 "configure"
+-#line 11726 "configure"
++#line 11968 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11839,7 +11678,7 @@
+@@ -11789,7 +12031,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+@@ -11839,7 +12081,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -11848,47 +12090,10 @@
fi
;;
@@ -3256,18 +5640,18 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11849,29 +11688,29 @@
- archive_cmds_need_lc=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+- ;;
+- darwin* | rhapsody*)
+- if test "$GCC" = yes; then
+- archive_cmds_need_lc=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
- allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag='-flat_namespace -undefined suppress'
- else
+- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
@@ -3276,31 +5660,27 @@
- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag='-undefined dynamic_lookup'
-+ ;;
-+ esac
- fi
- ;;
- esac
- output_verbose_link_cmd='echo'
+- fi
+- ;;
+- esac
+- output_verbose_link_cmd='echo'
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- hardcode_direct=no
- hardcode_automatic=yes
- hardcode_shlibpath_var=unsupported
-@@ -11905,7 +11744,8 @@
+- hardcode_direct=no
+- hardcode_automatic=yes
+- hardcode_shlibpath_var=unsupported
+- whole_archive_flag_spec='-all_load $convenience'
+- link_all_deplibs=yes
+- else
+- ld_shlibs=no
+- fi
+ ;;
+ esac
+ echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -11914,7 +12119,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -3310,7 +5690,34 @@
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 \
-@@ -12083,7 +11923,7 @@
+@@ -12028,11 +12234,11 @@
+ SED=$lt_SED
+
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -12062,6 +12268,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -12092,7 +12304,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -3319,7 +5726,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12114,7 +11954,7 @@
+@@ -12123,7 +12335,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -3328,7 +5735,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12356,7 +12196,10 @@
+@@ -12138,7 +12350,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -12365,7 +12577,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.
@@ -3340,7 +5756,84 @@
fi
-@@ -12624,8 +12467,8 @@
+@@ -12430,7 +12645,9 @@
+
+ case $tagname in
+ CXX)
+- if test -n "$CXX" && test "X$CXX" != "Xno"; then
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
+ ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -12467,7 +12684,7 @@
+ compiler_lib_search_path_CXX=
+
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -12488,6 +12705,20 @@
+ compiler=$CC
+
+
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -12509,7 +12740,16 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ compiler_CXX=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -12580,7 +12820,7 @@
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
++ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -12614,7 +12854,7 @@
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+@@ -12633,8 +12873,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
@@ -3351,7 +5844,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12651,7 +12494,7 @@
+@@ -12660,7 +12900,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.
@@ -3360,7 +5853,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12682,8 +12525,22 @@
+@@ -12691,8 +12931,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -3385,7 +5878,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12729,15 +12586,16 @@
+@@ -12709,7 +12963,7 @@
+ link_all_deplibs_CXX=yes
+
+ if test "$GXX" = yes; then
+- case $host_os in aix4.012|aix4.012.*)
++ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -12730,6 +12984,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -12738,15 +12995,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -3406,7 +5918,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.
-@@ -12767,8 +12625,7 @@
+@@ -12776,8 +13034,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3416,7 +5928,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12797,13 +12654,12 @@
+@@ -12806,13 +13063,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -3432,7 +5944,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12830,8 +12686,7 @@
+@@ -12839,8 +13095,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3442,16 +5954,23 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12869,7 +12724,7 @@
+@@ -12877,8 +13132,8 @@
+ # Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -12886,12 +12741,12 @@
+@@ -12891,16 +13146,17 @@
+ esac
+ ;;
+
++
+ cygwin* | mingw* | pw32*)
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -3466,7 +5985,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12900,7 +12755,7 @@
+@@ -12909,70 +13165,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3475,87 +5994,170 @@
else
ld_shlibs_CXX=no
fi
-@@ -12911,20 +12766,20 @@
- archive_cmds_need_lc_CXX=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+ ;;
++ darwin* | rhapsody*)
++ case $host_os in
++ rhapsody* | darwin1.[012])
++ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
++ esac
++ archive_cmds_need_lc_CXX=no
++ hardcode_direct_CXX=no
++ hardcode_automatic_CXX=yes
++ hardcode_shlibpath_var_CXX=unsupported
++ whole_archive_flag_spec_CXX=''
++ link_all_deplibs_CXX=yes
+
+- darwin* | rhapsody*)
+- if test "$GXX" = yes; then
+- archive_cmds_need_lc_CXX=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
- allow_undefined_flag_CXX='-Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag_CXX='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
- else
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_CXX='-undefined dynamic_lookup'
-+ ;;
-+ esac
++ if test "$GXX" = yes ; then
++ lt_int_apple_cc_single_mod=no
++ output_verbose_link_cmd='echo'
++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++ lt_int_apple_cc_single_mod=yes
fi
- ;;
- esac
-@@ -12934,19 +12789,19 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- hardcode_direct_CXX=no
- hardcode_automatic_CXX=yes
- hardcode_shlibpath_var_CXX=unsupported
-@@ -12981,7 +12836,7 @@
+- hardcode_direct_CXX=no
+- hardcode_automatic_CXX=yes
+- hardcode_shlibpath_var_CXX=unsupported
+- whole_archive_flag_spec_CXX='-all_load $convenience'
+- link_all_deplibs_CXX=yes
+- else
+- ld_shlibs_CXX=no
+- fi
+- ;;
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ else
++ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ fi
++ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ fi
++ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ ld_shlibs_CXX=no
++ ;;
++ esac
++ fi
++ ;;
+
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -12983,14 +13250,14 @@
+ ;;
+ esac
+ ;;
+- freebsd12*)
++ freebsd[12]*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13003,7 +12858,7 @@
+@@ -13007,12 +13274,12 @@
+ # location of the library.
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- aCC)
+- aCC)
- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ aCC*)
+ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13012,11 +12867,11 @@
+@@ -13021,11 +13288,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.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
*)
if test "$GXX" = yes; then
@@ -3564,7 +6166,38 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13073,7 +12928,7 @@
+@@ -13035,7 +13302,7 @@
+ ;;
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+@@ -13051,7 +13318,7 @@
+ ;;
+ esac
+ fi
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+@@ -13072,17 +13339,17 @@
+ esac
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- aCC)
+- case "$host_cpu" in
++ aCC*)
++ case $host_cpu in
+ hppa*64*|ia64*)
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -3573,7 +6206,13 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13094,7 +12949,7 @@
+@@ -13098,12 +13365,12 @@
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*|hppa*64*)
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -3582,28 +6221,38 @@
;;
esac
fi
-@@ -13109,7 +12964,7 @@
+@@ -13116,9 +13383,9 @@
+ ;;
+ irix5* | irix6*)
case $cc_basename in
- CC)
+- CC)
++ CC*)
# SGI C++
- archive_cmds_CXX='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13120,9 +12975,9 @@
+@@ -13129,9 +13396,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
fi
link_all_deplibs_CXX=yes
-@@ -13139,8 +12994,8 @@
+@@ -13142,14 +13409,14 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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.
@@ -3614,19 +6263,49 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13162,16 +13017,16 @@
+@@ -13167,20 +13434,44 @@
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+- icpc)
++ icpc*)
# Intel C++
with_gnu_ld=yes
++ # version 8.0 and above of icpc choke on multiply defined symbols
++ # if we add $predep_objects and $postdep_objects, however 7.1 and
++ # earlier do not add the objects themselves.
++ case `$CC -V 2>&1` in
++ *"Version 7."*)
++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ *) # Version 8.0 or newer
++ tmp_idyn=
++ case $host_cpu in
++ ia64*) tmp_idyn=' -i_dynamic';;
++ esac
++ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ esac
archive_cmds_need_lc_CXX=no
- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
+- cxx)
++ pgCC*)
++ # Portland Group C++ compiler
++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ ;;
++ cxx*)
# Compaq C++
- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -3635,8 +6314,17 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13209,7 +13064,7 @@
+@@ -13208,7 +13499,7 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
;;
+@@ -13218,7 +13509,7 @@
+ ;;
esac
;;
- netbsd*)
@@ -3644,7 +6332,32 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13228,7 +13083,7 @@
+@@ -13229,15 +13520,31 @@
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
++ openbsd2*)
++ # C++ shared libraries are fairly broken
++ ld_shlibs_CXX=no
++ ;;
++ openbsd*)
++ hardcode_direct_CXX=yes
++ hardcode_shlibpath_var_CXX=no
++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ export_dynamic_flag_spec_CXX='${wl}-E'
++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ ;;
+ osf3*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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.
@@ -3653,25 +6366,41 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13245,7 +13100,7 @@
+@@ -13247,14 +13554,14 @@
+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+
;;
- cxx)
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- cxx)
++ cxx*)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13263,7 +13118,7 @@
+@@ -13272,7 +13579,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13288,7 +13143,7 @@
+@@ -13291,13 +13598,13 @@
+ ;;
+ osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# 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.
@@ -3680,50 +6409,123 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13304,10 +13159,10 @@
+@@ -13306,17 +13613,17 @@
+ # the KAI C++ compiler.
+ old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
- cxx)
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- cxx)
++ cxx*)
allow_undefined_flag_CXX=' -expect_unresolved \*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
-+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13326,7 +13181,7 @@
+@@ -13335,7 +13642,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13383,9 +13238,9 @@
- CC)
+@@ -13359,7 +13666,7 @@
+ sco*)
+ archive_cmds_need_lc_CXX=no
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+@@ -13371,12 +13678,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -13389,36 +13696,33 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
++ archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
-@@ -13419,7 +13274,7 @@
+ case $host_os in
+- solaris2.0-5 | solaris2.0-5.*) ;;
++ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ # The C++ compiler is used as linker so we must use $wl
+ # flag to pass the commands to the underlying system
+- # linker.
++ # linker. We must also pass each convience library through
++ # to the system linker between allextract/defaultextract.
++ # The C++ compiler will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ link_all_deplibs_CXX=yes
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # 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.
+- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -13426,9 +13730,9 @@
+ # in the archive.
+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
- gcx)
+- gcx)
++ gcx*)
# Green Hills C++ Compiler
- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13429,9 +13284,9 @@
+@@ -13438,9 +13742,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -3735,7 +6537,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13440,9 +13295,9 @@
+@@ -13449,9 +13753,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -3747,7 +6549,25 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13557,7 +13412,7 @@
+@@ -13469,7 +13773,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -13526,7 +13830,7 @@
+ # The `*' in the case matches for architectures that use `case' in
+ # $output_verbose_cmd can trigger glob expansion during the loop
+ # eval without this substitution.
+- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+ for p in `eval $output_verbose_link_cmd`; do
+ case $p in
+@@ -13566,7 +13870,7 @@
fi
;;
@@ -3756,17 +6576,142 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13692,7 +13547,7 @@
+@@ -13602,6 +13906,20 @@
+
+ $rm -f confest.$objext
+
++# PORTME: override above test on systems where it is broken
++case $host_os in
++solaris*)
++ case $cc_basename in
++ CC*)
++ # Adding this requires a known-good setup of shared libraries for
++ # Sun compiler versions before 5.6, else PIC objects from an old
++ # archive will be linked into the output, leading to subtle bugs.
++ postdeps_CXX='-lCstd -lCrun'
++ ;;
++ esac
++esac
++
++
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -13657,7 +13975,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+@@ -13682,18 +14000,28 @@
+ ;;
+ chorus*)
+ case $cc_basename in
+- cxch68)
++ cxch68*)
+ # Green Hills C++ Compiler
+ # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ ;;
+ esac
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ lt_prog_compiler_pic_CXX='-qnocommon'
++ lt_prog_compiler_wl_CXX='-Wl,'
++ ;;
++ esac
++ ;;
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ lt_prog_compiler_pic_CXX='-KPIC'
;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ lt_prog_compiler_pic_CXX='-pic'
+ ;;
+@@ -13701,22 +14029,22 @@
+ ;;
esac
;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13768,7 +13623,7 @@
+ case $cc_basename in
+- CC)
++ CC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ if test "$host_cpu" != ia64; then
+ lt_prog_compiler_pic_CXX='+Z'
+ fi
;;
+- aCC)
++ aCC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -13731,7 +14059,7 @@
+ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+- CC)
++ CC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_static_CXX='-non_shared'
+ # CC pic flag -KPIC is the default.
+@@ -13742,18 +14070,24 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # KAI C++ Compiler
+ lt_prog_compiler_wl_CXX='--backend -Wl,'
+ lt_prog_compiler_pic_CXX='-fPIC'
+ ;;
+- icpc)
++ icpc* | ecpc*)
+ # Intel C++
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-static'
+ ;;
+- cxx)
++ pgCC*)
++ # Portland Group C++ compiler.
++ lt_prog_compiler_wl_CXX='-Wl,'
++ lt_prog_compiler_pic_CXX='-fpic'
++ lt_prog_compiler_static_CXX='-Bstatic'
++ ;;
++ cxx*)
+ # Compaq C++
+ # Make sure the PIC flag is empty. It appears that all Alpha
+ # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -13770,25 +14104,25 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ lt_prog_compiler_pic_CXX='-W c,exportall'
+ ;;
+ *)
+ ;;
esac
;;
- netbsd*)
@@ -3774,21 +6719,105 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13879,11 +13734,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+- KCC)
++ KCC*)
+ lt_prog_compiler_wl_CXX='--backend -Wl,'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ lt_prog_compiler_pic_CXX='-pic'
+ ;;
+- cxx)
++ cxx*)
+ # Digital/Compaq C++
+ lt_prog_compiler_wl_CXX='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+@@ -13804,7 +14138,7 @@
+ ;;
+ sco*)
+ case $cc_basename in
+- CC)
++ CC*)
+ lt_prog_compiler_pic_CXX='-fPIC'
+ ;;
+ *)
+@@ -13813,13 +14147,13 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-Bstatic'
+ lt_prog_compiler_wl_CXX='-Qoption ld '
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+ lt_prog_compiler_pic_CXX='-PIC'
+ ;;
+@@ -13829,12 +14163,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ lt_prog_compiler_pic_CXX='-pic'
+ lt_prog_compiler_static_CXX='-Bstatic'
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ lt_prog_compiler_pic_CXX='-pic'
+ ;;
+@@ -13844,7 +14178,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ lt_prog_compiler_pic_CXX='-KPIC'
+ ;;
+@@ -13885,18 +14219,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13882: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13737: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13891: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14225: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13886: \$? = $ac_status" >&5
-+ echo "$as_me:13741: \$? = $ac_status" >&5
+- echo "$as_me:13895: \$? = $ac_status" >&5
++ echo "$as_me:14229: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -13930,13 +13785,6 @@
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_pic_works_CXX=yes
+ fi
+ fi
+@@ -13917,7 +14253,7 @@
+ fi
+
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_CXX=
+@@ -13939,38 +14275,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3802,26 +6831,35 @@
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.
-@@ -13946,11 +13794,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13949: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13797: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13958: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14287: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13953: \$? = $ac_status" >&5
-+ echo "$as_me:13801: \$? = $ac_status" >&5
+- echo "$as_me:13962: \$? = $ac_status" >&5
++ echo "$as_me:14291: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13960,8 +13808,11 @@
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_CXX=yes
fi
fi
- chmod u+w .
+- chmod u+w .
- $rm conftest* out/*
- rmdir out
++ chmod u+w . 2>&5
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
@@ -3830,17 +6868,19 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14013,6 +13864,9 @@
+@@ -14020,7 +14354,10 @@
+ export_symbols_cmds_CXX="$ltdll_cmds"
+ ;;
cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ ;;
+ linux*)
+ link_all_deplibs_CXX=no
-+ ;;
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -14094,7 +13948,7 @@
+@@ -14103,7 +14440,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -3849,7 +6889,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14104,7 +13958,20 @@
+@@ -14113,7 +14450,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3871,7 +6911,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14169,7 +14036,7 @@
+@@ -14178,7 +14528,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -3880,8 +6920,17 @@
;;
beos*)
-@@ -14194,7 +14061,7 @@
+@@ -14187,7 +14537,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+-bsdi4*)
++bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14203,7 +14553,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -3889,34 +6938,85 @@
need_version=no
need_lib_prefix=no
-@@ -14259,7 +14126,7 @@
+@@ -14215,7 +14565,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -14245,7 +14596,7 @@
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -14268,7 +14619,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# 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"`
-@@ -14282,7 +14149,7 @@
+@@ -14291,7 +14642,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14342,7 +14209,7 @@
+@@ -14303,8 +14654,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[123]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -14322,7 +14682,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -14349,9 +14709,9 @@
+ version_type=sunos
+ need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14357,7 +14224,7 @@
+@@ -14366,7 +14726,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -3925,7 +7025,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14368,7 +14235,7 @@
+@@ -14377,7 +14737,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -3934,7 +7034,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14430,22 +14297,19 @@
+@@ -14439,22 +14799,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'
@@ -3956,14 +7056,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# 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,
-@@ -14455,6 +14319,30 @@
+@@ -14464,6 +14821,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3994,7 +7094,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14464,7 +14352,7 @@
+@@ -14473,7 +14854,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4003,16 +7103,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14493,7 +14381,7 @@
+@@ -14502,7 +14883,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-+ need_version=yes
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
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
-@@ -14513,7 +14401,7 @@
+@@ -14522,7 +14907,7 @@
os2*)
libname_spec='$name'
@@ -4021,7 +7125,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14742,8 +14630,7 @@
+@@ -14624,8 +15009,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action_CXX=
+ if test -n "$hardcode_libdir_flag_spec_CXX" || \
+- test -n "$runpath_var CXX" || \
+- test "X$hardcode_automatic_CXX"="Xyes" ; then
++ test -n "$runpath_var_CXX" || \
++ test "X$hardcode_automatic_CXX" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_CXX" != no &&
+@@ -14751,8 +15136,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4031,7 +7146,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14846,8 +14733,7 @@
+@@ -14855,8 +15239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4041,7 +7156,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14912,8 +14798,7 @@
+@@ -14921,8 +15304,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4051,7 +7166,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15006,8 +14891,7 @@
+@@ -15015,8 +15397,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4061,7 +7176,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15072,8 +14956,7 @@
+@@ -15081,8 +15462,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4071,7 +7186,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15139,8 +15022,7 @@
+@@ -15148,8 +15528,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4081,7 +7196,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15206,8 +15088,7 @@
+@@ -15215,8 +15594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4091,25 +7206,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15282,7 +15163,7 @@
+@@ -15291,7 +15669,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15285 "configure"
-+#line 15166 "configure"
+-#line 15294 "configure"
++#line 15672 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15380,7 +15261,7 @@
+@@ -15357,7 +15735,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+@@ -15389,7 +15767,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15383 "configure"
-+#line 15264 "configure"
+-#line 15392 "configure"
++#line 15770 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15497,7 +15378,8 @@
+@@ -15455,7 +15833,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+@@ -15506,7 +15884,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -4119,7 +7252,20 @@
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 \
-@@ -15627,7 +15509,7 @@
+@@ -15606,6 +15985,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -15636,7 +16021,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4128,7 +7274,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15658,7 +15540,7 @@
+@@ -15667,7 +16052,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4137,7 +7283,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15875,7 +15757,10 @@
+@@ -15682,7 +16067,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -15884,7 +16269,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.
@@ -4149,30 +7304,185 @@
fi
-@@ -15977,7 +15862,7 @@
+@@ -15960,12 +16348,35 @@
+ compiler=$CC
+
+
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ compiler_F77=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+
+ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+@@ -15978,7 +16389,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -15986,8 +16397,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
+- test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
- test "$enable_shared" = yes && enable_static=no
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
;;
esac
-@@ -16203,11 +16088,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -16064,7 +16477,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -16090,6 +16503,16 @@
+ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ lt_prog_compiler_pic_F77='-qnocommon'
++ lt_prog_compiler_wl_F77='-Wl,'
++ ;;
++ esac
++ ;;
+
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -16101,7 +16524,7 @@
+ lt_prog_compiler_wl_F77='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -16125,12 +16548,19 @@
+ ;;
+
+ linux*)
+- case $CC in
++ case $cc_basename in
+ icc* | ecc*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-static'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ lt_prog_compiler_wl_F77='-Wl,'
++ lt_prog_compiler_pic_F77='-fpic'
++ lt_prog_compiler_static_F77='-Bstatic'
++ ;;
+ ccc*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ # All Alpha code is PIC.
+@@ -16151,9 +16581,14 @@
+ ;;
+
+ solaris*)
+- lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ lt_prog_compiler_wl_F77='-Qoption ld ';;
++ *)
++ lt_prog_compiler_wl_F77='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -16175,6 +16610,11 @@
+ fi
+ ;;
+
++ unicos*)
++ lt_prog_compiler_wl_F77='-Wl,'
++ lt_prog_compiler_can_build_shared_F77=no
++ ;;
++
+ uts4*)
+ lt_prog_compiler_pic_F77='-pic'
+ lt_prog_compiler_static_F77='-Bstatic'
+@@ -16209,18 +16649,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16206: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16091: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16215: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16655: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16210: \$? = $ac_status" >&5
-+ echo "$as_me:16095: \$? = $ac_status" >&5
+- echo "$as_me:16219: \$? = $ac_status" >&5
++ echo "$as_me:16659: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -16254,13 +16139,6 @@
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_pic_works_F77=yes
+ fi
+ fi
+@@ -16241,7 +16683,7 @@
+ fi
+
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_F77=
+@@ -16263,38 +16705,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4186,26 +7496,35 @@
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.
-@@ -16270,11 +16148,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16273: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16151: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16282: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16717: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16277: \$? = $ac_status" >&5
-+ echo "$as_me:16155: \$? = $ac_status" >&5
+- echo "$as_me:16286: \$? = $ac_status" >&5
++ echo "$as_me:16721: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16284,8 +16162,11 @@
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_F77=yes
fi
fi
- chmod u+w .
+- chmod u+w .
- $rm conftest* out/*
- rmdir out
++ chmod u+w . 2>&5
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
@@ -4214,7 +7533,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16413,7 +16294,7 @@
+@@ -16365,6 +16805,16 @@
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ extract_expsyms_cmds=
++ # Just being paranoid about ensuring that cc_basename is set.
++ for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+@@ -16385,6 +16835,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
++ export_dynamic_flag_spec_F77='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ whole_archive_flag_spec_F77=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -16422,7 +16893,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4223,7 +7587,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16423,13 +16304,13 @@
+@@ -16432,13 +16903,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -4231,7 +7595,8 @@
+ allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -4239,18 +7604,51 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16438,19 +16319,19 @@
+@@ -16447,19 +16918,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
- ld_shlibs=no
+- ld_shlibs=no
++ ld_shlibs_F77=no
fi
;;
- netbsd*)
++ linux*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ link_all_deplibs_F77=no
++ else
++ ld_shlibs_F77=no
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -4263,7 +7661,7 @@
fi
;;
-@@ -16468,8 +16349,8 @@
+@@ -16477,8 +16980,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4274,36 +7672,8 @@
else
ld_shlibs_F77=no
fi
-@@ -16482,10 +16363,36 @@
- hardcode_shlibpath_var_F77=no
- ;;
+@@ -16493,24 +16996,19 @@
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_cmds_F77="$tmp_archive_cmds"
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ archive_expsym_cmds_F77="$tmp_archive_cmds"
-+ fi
-+ link_all_deplibs_F77=no
-+ else
-+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -4313,7 +7683,28 @@
else
ld_shlibs_F77=no
fi
-@@ -16535,9 +16442,20 @@
+ ;;
+ esac
+
+- if test "$ld_shlibs_F77" = yes; then
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+- export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- whole_archive_flag_spec_F77=
+- fi
++ if test "$ld_shlibs_F77" = no; then
++ runpath_var=
++ hardcode_libdir_flag_spec_F77=
++ export_dynamic_flag_spec_F77=
++ whole_archive_flag_spec_F77=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -16544,9 +17042,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -4336,7 +7727,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16583,21 +16501,22 @@
+@@ -16563,7 +17072,7 @@
+ link_all_deplibs_F77=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.012|aix4.012.*)
++ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -16584,6 +17093,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -16592,21 +17104,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4364,7 +7774,7 @@
program main
end
-@@ -16611,8 +16530,7 @@
+@@ -16620,8 +17133,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4374,7 +7784,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16639,14 +16557,13 @@
+@@ -16648,14 +17160,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4392,7 +7802,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16663,8 +16580,7 @@
+@@ -16672,8 +17183,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4402,16 +7812,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16702,7 +16618,7 @@
+@@ -16710,8 +17220,8 @@
+ # Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -16725,13 +16641,13 @@
+@@ -16724,7 +17234,7 @@
+ ld_shlibs_F77=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec_F77=-rdynamic
+ ;;
+
+@@ -16734,68 +17244,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -4428,78 +7849,114 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
-@@ -16745,21 +16661,21 @@
- archive_cmds_need_lc_F77=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+ old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_F77=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- archive_cmds_need_lc_F77=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
- allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag_F77='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
+- ;;
+- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_F77='-undefined dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[012])
++ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
-@@ -16768,18 +16684,18 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_need_lc_F77=no
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
-@@ -16820,8 +16736,8 @@
+- whole_archive_flag_spec_F77='-all_load $convenience'
++ whole_archive_flag_spec_F77=''
+ link_all_deplibs_F77=yes
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+- ld_shlibs_F77=no
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ ld_shlibs_F77=no
++ ;;
++ esac
+ fi
;;
+@@ -16829,8 +17339,8 @@
+ ;;
+
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16829,7 +16745,7 @@
+@@ -16838,7 +17348,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4508,9 +7965,12 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -16847,10 +16763,10 @@
+@@ -16854,16 +17364,16 @@
+
+ hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
hppa*64*|ia64*)
- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -4521,7 +7981,21 @@
;;
esac
else
-@@ -16897,7 +16813,7 @@
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -16873,7 +17383,7 @@
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+@@ -16906,7 +17416,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4530,7 +8004,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16907,7 +16823,7 @@
+@@ -16916,7 +17426,7 @@
link_all_deplibs_F77=yes
;;
@@ -4539,16 +8013,17 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16930,7 +16846,7 @@
+@@ -16939,7 +17449,8 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16940,7 +16856,7 @@
+@@ -16949,7 +17460,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -4557,7 +8032,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16951,14 +16867,14 @@
+@@ -16960,14 +17471,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -4574,7 +8049,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -16970,7 +16886,7 @@
+@@ -16979,13 +17490,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -4583,19 +8058,50 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16995,9 +16911,9 @@
+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec_F77='-rpath $libdir'
+@@ -17004,10 +17515,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
++ wlarc=''
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -17017,7 +16933,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -17016,8 +17529,18 @@
+ hardcode_shlibpath_var_F77=no
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl, iff we do not link with $LD.
++ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ case $wlarc in
++ '')
++ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++ *)
++ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ esac ;;
+ esac
+ link_all_deplibs_F77=yes
+ ;;
+@@ -17026,7 +17549,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.
@@ -4604,7 +8110,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17077,9 +16993,9 @@
+@@ -17086,9 +17609,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -4616,7 +8122,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17185,7 +17101,7 @@
+@@ -17194,7 +17717,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4625,7 +8131,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17195,7 +17111,20 @@
+@@ -17204,7 +17727,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4647,7 +8153,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17260,7 +17189,7 @@
+@@ -17269,7 +17805,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4656,8 +8162,17 @@
;;
beos*)
-@@ -17285,7 +17214,7 @@
+@@ -17278,7 +17814,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+-bsdi4*)
++bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17294,7 +17830,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -4665,34 +8180,85 @@
need_version=no
need_lib_prefix=no
-@@ -17350,7 +17279,7 @@
+@@ -17306,7 +17842,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -17336,7 +17873,7 @@
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -17359,7 +17896,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# 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"`
-@@ -17373,7 +17302,7 @@
+@@ -17382,7 +17919,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17433,7 +17362,7 @@
+@@ -17394,8 +17931,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[123]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -17413,7 +17959,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -17440,9 +17986,9 @@
+ version_type=sunos
+ need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17448,7 +17377,7 @@
+@@ -17457,7 +18003,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4701,7 +8267,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17459,7 +17388,7 @@
+@@ -17468,7 +18014,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4710,7 +8276,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17521,22 +17450,19 @@
+@@ -17530,22 +18076,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'
@@ -4732,14 +8298,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# 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,
-@@ -17546,6 +17472,30 @@
+@@ -17555,6 +18098,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4770,7 +8336,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17555,7 +17505,7 @@
+@@ -17564,7 +18131,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4779,16 +8345,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17584,7 +17534,7 @@
+@@ -17593,7 +18160,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-+ need_version=yes
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
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
-@@ -17604,7 +17554,7 @@
+@@ -17613,7 +18184,7 @@
os2*)
libname_spec='$name'
@@ -4797,7 +8367,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17783,7 +17733,8 @@
+@@ -17715,8 +18286,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action_F77=
+ if test -n "$hardcode_libdir_flag_spec_F77" || \
+- test -n "$runpath_var F77" || \
+- test "X$hardcode_automatic_F77"="Xyes" ; then
++ test -n "$runpath_var_F77" || \
++ test "X$hardcode_automatic_F77" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_F77" != no &&
+@@ -17792,7 +18363,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -4807,7 +8388,20 @@
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 \
-@@ -17913,7 +17864,7 @@
+@@ -17892,6 +18464,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -17922,7 +18500,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4816,7 +8410,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17944,7 +17895,7 @@
+@@ -17953,7 +18531,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4825,7 +8419,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18161,7 +18112,10 @@
+@@ -17968,7 +18546,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -18170,7 +18748,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.
@@ -4837,35 +8440,203 @@
fi
-@@ -18243,11 +18197,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+@@ -18203,7 +18784,7 @@
+ lt_simple_compile_test_code="class foo {}\n"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+@@ -18214,15 +18795,41 @@
+ compiler=$CC
+
+
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ compiler_GCJ=$CC
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ archive_cmds_need_lc_GCJ=no
+
++old_archive_cmds_GCJ=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -18249,18 +18856,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18246: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18200: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18255: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18862: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18250: \$? = $ac_status" >&5
-+ echo "$as_me:18204: \$? = $ac_status" >&5
+- echo "$as_me:18259: \$? = $ac_status" >&5
++ echo "$as_me:18866: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -18476,11 +18430,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_rtti_exceptions=yes
+ fi
+ fi
+@@ -18337,7 +18946,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -18363,6 +18972,16 @@
+ lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ lt_prog_compiler_pic_GCJ='-qnocommon'
++ lt_prog_compiler_wl_GCJ='-Wl,'
++ ;;
++ esac
++ ;;
+
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -18374,7 +18993,7 @@
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -18398,12 +19017,19 @@
+ ;;
+
+ linux*)
+- case $CC in
++ case $cc_basename in
+ icc* | ecc*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-static'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ lt_prog_compiler_wl_GCJ='-Wl,'
++ lt_prog_compiler_pic_GCJ='-fpic'
++ lt_prog_compiler_static_GCJ='-Bstatic'
++ ;;
+ ccc*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ # All Alpha code is PIC.
+@@ -18424,9 +19050,14 @@
+ ;;
+
+ solaris*)
+- lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ lt_prog_compiler_wl_GCJ='-Qoption ld ';;
++ *)
++ lt_prog_compiler_wl_GCJ='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -18448,6 +19079,11 @@
+ fi
+ ;;
+
++ unicos*)
++ lt_prog_compiler_wl_GCJ='-Wl,'
++ lt_prog_compiler_can_build_shared_GCJ=no
++ ;;
++
+ uts4*)
+ lt_prog_compiler_pic_GCJ='-pic'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -18482,18 +19118,20 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18479: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18433: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18488: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19124: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18483: \$? = $ac_status" >&5
-+ echo "$as_me:18437: \$? = $ac_status" >&5
+- echo "$as_me:18492: \$? = $ac_status" >&5
++ echo "$as_me:19128: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -18527,13 +18481,6 @@
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_prog_compiler_pic_works_GCJ=yes
+ fi
+ fi
+@@ -18514,7 +19152,7 @@
+ fi
+
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_GCJ=
+@@ -18536,38 +19174,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4879,26 +8650,35 @@
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.
-@@ -18543,11 +18490,11 @@
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18546: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18493: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18555: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19186: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18550: \$? = $ac_status" >&5
-+ echo "$as_me:18497: \$? = $ac_status" >&5
+- echo "$as_me:18559: \$? = $ac_status" >&5
++ echo "$as_me:19190: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18557,8 +18504,11 @@
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_GCJ=yes
fi
fi
- chmod u+w .
+- chmod u+w .
- $rm conftest* out/*
- rmdir out
++ chmod u+w . 2>&5
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
@@ -4907,7 +8687,52 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18686,7 +18636,7 @@
+@@ -18638,6 +19274,16 @@
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ extract_expsyms_cmds=
++ # Just being paranoid about ensuring that cc_basename is set.
++ for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+@@ -18658,6 +19304,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
++ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ whole_archive_flag_spec_GCJ=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -18695,7 +19362,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4916,7 +8741,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18696,13 +18646,13 @@
+@@ -18705,13 +19372,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -4924,7 +8749,8 @@
+ allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -4932,18 +8758,51 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18711,19 +18661,19 @@
+@@ -18720,19 +19387,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
- ld_shlibs=no
+- ld_shlibs=no
++ ld_shlibs_GCJ=no
fi
;;
- netbsd*)
++ linux*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ link_all_deplibs_GCJ=no
++ else
++ ld_shlibs_GCJ=no
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -4956,7 +8815,7 @@
fi
;;
-@@ -18741,8 +18691,8 @@
+@@ -18750,8 +19449,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4967,36 +8826,8 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18755,10 +18705,36 @@
- hardcode_shlibpath_var_GCJ=no
- ;;
+@@ -18766,24 +19465,19 @@
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_cmds_GCJ="$tmp_archive_cmds"
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ archive_expsym_cmds_GCJ="$tmp_archive_cmds"
-+ fi
-+ link_all_deplibs_GCJ=no
-+ else
-+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -5006,7 +8837,28 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18808,9 +18784,20 @@
+ ;;
+ esac
+
+- if test "$ld_shlibs_GCJ" = yes; then
+- runpath_var=LD_RUN_PATH
+- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+- export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- whole_archive_flag_spec_GCJ=
+- fi
++ if test "$ld_shlibs_GCJ" = no; then
++ runpath_var=
++ hardcode_libdir_flag_spec_GCJ=
++ export_dynamic_flag_spec_GCJ=
++ whole_archive_flag_spec_GCJ=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -18817,9 +19511,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -5029,7 +8881,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18856,21 +18843,22 @@
+@@ -18836,7 +19541,7 @@
+ link_all_deplibs_GCJ=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.012|aix4.012.*)
++ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -18857,6 +19562,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -18865,21 +19573,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5057,7 +8928,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18894,8 +18882,7 @@
+@@ -18903,8 +19612,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5067,7 +8938,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18922,14 +18909,13 @@
+@@ -18931,14 +19639,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5085,7 +8956,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18956,8 +18942,7 @@
+@@ -18965,8 +19672,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5095,16 +8966,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18995,7 +18980,7 @@
+@@ -19003,8 +19709,8 @@
+ # Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -19018,13 +19003,13 @@
+@@ -19017,7 +19723,7 @@
+ ld_shlibs_GCJ=no
+ ;;
+
+- bsdi4*)
++ bsdi[45]*)
+ export_dynamic_flag_spec_GCJ=-rdynamic
+ ;;
+
+@@ -19027,68 +19733,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -5121,78 +9003,114 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
-@@ -19038,21 +19023,21 @@
- archive_cmds_need_lc_GCJ=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
+ old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_GCJ=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- archive_cmds_need_lc_GCJ=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
- allow_undefined_flag_GCJ='-Wl,-undefined -Wl,suppress'
-+ allow_undefined_flag_GCJ='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
+- ;;
+- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[012])
++ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[012])
++ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
-@@ -19061,18 +19046,18 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_need_lc_GCJ=no
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
-@@ -19113,8 +19098,8 @@
+- whole_archive_flag_spec_GCJ='-all_load $convenience'
++ whole_archive_flag_spec_GCJ=''
+ link_all_deplibs_GCJ=yes
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+- ld_shlibs_GCJ=no
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ ld_shlibs_GCJ=no
++ ;;
++ esac
+ fi
;;
+@@ -19122,8 +19828,8 @@
+ ;;
+
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
- archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19122,7 +19107,7 @@
+@@ -19131,7 +19837,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5201,9 +9119,12 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -19140,10 +19125,10 @@
+@@ -19147,16 +19853,16 @@
+
+ hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
hppa*64*|ia64*)
- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -5214,7 +9135,21 @@
;;
esac
else
-@@ -19190,7 +19175,7 @@
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -19166,7 +19872,7 @@
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+@@ -19199,7 +19905,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5223,7 +9158,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19200,7 +19185,7 @@
+@@ -19209,7 +19915,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5232,16 +9167,17 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19223,7 +19208,7 @@
+@@ -19232,7 +19938,8 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19233,7 +19218,7 @@
+@@ -19242,7 +19949,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -5250,7 +9186,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19244,14 +19229,14 @@
+@@ -19253,14 +19960,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -5267,7 +9203,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19263,7 +19248,7 @@
+@@ -19272,13 +19979,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -5276,19 +9212,50 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19288,9 +19273,9 @@
+ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+@@ -19297,10 +20004,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
++ wlarc=''
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -19310,7 +19295,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -19309,8 +20018,18 @@
+ hardcode_shlibpath_var_GCJ=no
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl, iff we do not link with $LD.
++ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ case $wlarc in
++ '')
++ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++ *)
++ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ esac ;;
+ esac
+ link_all_deplibs_GCJ=yes
+ ;;
+@@ -19319,7 +20038,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.
@@ -5297,7 +9264,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19370,9 +19355,9 @@
+@@ -19379,9 +20098,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5309,7 +9276,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19478,7 +19463,7 @@
+@@ -19487,7 +20206,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5318,7 +9285,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19488,7 +19473,20 @@
+@@ -19497,7 +20216,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5340,7 +9307,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19553,7 +19551,7 @@
+@@ -19562,7 +20294,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5349,8 +9316,17 @@
;;
beos*)
-@@ -19578,7 +19576,7 @@
+@@ -19571,7 +20303,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+-bsdi4*)
++bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -19587,7 +20319,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -5358,34 +9334,85 @@
need_version=no
need_lib_prefix=no
-@@ -19643,7 +19641,7 @@
+@@ -19599,7 +20331,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -19629,7 +20362,7 @@
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -19652,7 +20385,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# 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"`
-@@ -19666,7 +19664,7 @@
+@@ -19675,7 +20408,7 @@
dynamic_linker=no
;;
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19726,7 +19724,7 @@
+@@ -19687,8 +20420,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[123]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -19706,7 +20448,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.01* | freebsdelf3.01*)
++ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -19733,9 +20475,9 @@
+ version_type=sunos
+ need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19741,7 +19739,7 @@
+@@ -19750,7 +20492,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5394,7 +9421,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19752,7 +19750,7 @@
+@@ -19761,7 +20503,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5403,7 +9430,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19814,22 +19812,19 @@
+@@ -19823,22 +20565,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'
@@ -5425,14 +9452,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# 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,
-@@ -19839,6 +19834,30 @@
+@@ -19848,6 +20587,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5463,7 +9490,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19848,7 +19867,7 @@
+@@ -19857,7 +20620,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5472,16 +9499,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19877,7 +19896,7 @@
+@@ -19886,7 +20649,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-+ need_version=yes
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
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
-@@ -19897,7 +19916,7 @@
+@@ -19906,7 +20673,7 @@
os2*)
libname_spec='$name'
@@ -5490,7 +9521,18 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20126,8 +20145,7 @@
+@@ -20008,8 +20775,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action_GCJ=
+ if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+- test -n "$runpath_var GCJ" || \
+- test "X$hardcode_automatic_GCJ"="Xyes" ; then
++ test -n "$runpath_var_GCJ" || \
++ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+@@ -20135,8 +20902,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5500,7 +9542,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20230,8 +20248,7 @@
+@@ -20239,8 +21005,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5510,7 +9552,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20296,8 +20313,7 @@
+@@ -20305,8 +21070,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5520,7 +9562,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20390,8 +20406,7 @@
+@@ -20399,8 +21163,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5530,7 +9572,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20456,8 +20471,7 @@
+@@ -20465,8 +21228,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5540,7 +9582,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20523,8 +20537,7 @@
+@@ -20532,8 +21294,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5550,7 +9592,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20590,8 +20603,7 @@
+@@ -20599,8 +21360,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5560,25 +9602,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20666,7 +20678,7 @@
+@@ -20675,7 +21435,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20669 "configure"
-+#line 20681 "configure"
+-#line 20678 "configure"
++#line 21438 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20764,7 +20776,7 @@
+@@ -20741,7 +21501,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+@@ -20773,7 +21533,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20767 "configure"
-+#line 20779 "configure"
+-#line 20776 "configure"
++#line 21536 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20881,7 +20893,8 @@
+@@ -20839,7 +21599,7 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+@@ -20890,7 +21650,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -5588,7 +9648,20 @@
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 \
-@@ -21011,7 +21024,7 @@
+@@ -20990,6 +21751,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -21020,7 +21787,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5597,7 +9670,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21042,7 +21055,7 @@
+@@ -21051,7 +21818,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5606,7 +9679,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21259,7 +21272,10 @@
+@@ -21066,7 +21833,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -21268,7 +22035,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.
@@ -5618,7 +9700,43 @@
fi
-@@ -21322,7 +21338,8 @@
+@@ -21311,11 +22081,35 @@
+ compiler=$CC
+
+
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ compiler_RC=$CC
++for cc_temp in $compiler""; do
++ case $cc_temp in
++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+ lt_cv_prog_compiler_c_o_RC=yes
+
+ # The else clause should only fire when bootstrapping the
+@@ -21331,7 +22125,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -5628,7 +9746,20 @@
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 \
-@@ -21452,7 +21469,7 @@
+@@ -21431,6 +22226,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -21461,7 +22262,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5637,7 +9768,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21483,7 +21500,7 @@
+@@ -21492,7 +22293,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5646,7 +9777,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21700,7 +21717,10 @@
+@@ -21507,7 +22308,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -21709,7 +22510,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.
@@ -5658,7 +9798,7 @@
fi
-@@ -21747,7 +21767,7 @@
+@@ -21756,7 +22560,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -5667,7 +9807,7 @@
# Prevent multiple expansion
-@@ -21984,8 +22004,7 @@
+@@ -21997,8 +22801,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5677,7 +9817,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22059,9 +22078,6 @@
+@@ -22072,9 +22875,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5687,7 +9827,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22095,8 +22111,7 @@
+@@ -22108,8 +22908,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5697,7 +9837,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22200,8 +22215,7 @@
+@@ -22213,8 +23012,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5707,7 +9847,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22280,9 +22294,6 @@
+@@ -22293,9 +23091,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5717,7 +9857,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22315,8 +22326,7 @@
+@@ -22328,8 +23123,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5727,7 +9867,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22419,8 +22429,7 @@
+@@ -22432,8 +23226,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5737,7 +9877,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22510,8 +22519,7 @@
+@@ -22523,8 +23316,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5747,7 +9887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22572,8 +22580,7 @@
+@@ -22585,8 +23377,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5757,7 +9897,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22641,8 +22648,7 @@
+@@ -22654,8 +23445,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5767,7 +9907,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22708,8 +22714,7 @@
+@@ -22721,8 +23511,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5777,7 +9917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22802,8 +22807,7 @@
+@@ -22815,8 +23604,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5787,7 +9927,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22881,8 +22885,7 @@
+@@ -22894,8 +23682,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5797,7 +9937,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22966,8 +22969,7 @@
+@@ -22979,8 +23766,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5807,7 +9947,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23035,8 +23037,7 @@
+@@ -23048,8 +23834,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5817,7 +9957,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23131,8 +23132,7 @@
+@@ -23144,8 +23929,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5827,7 +9967,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23196,8 +23196,7 @@
+@@ -23209,8 +23993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5837,7 +9977,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23292,8 +23291,7 @@
+@@ -23305,8 +24088,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5847,7 +9987,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23357,8 +23355,7 @@
+@@ -23370,8 +24152,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5857,7 +9997,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23454,8 +23451,7 @@
+@@ -23467,8 +24248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5867,7 +10007,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23519,8 +23515,7 @@
+@@ -23532,8 +24312,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5877,7 +10017,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23617,8 +23612,7 @@
+@@ -23630,8 +24409,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5887,7 +10027,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23683,8 +23677,7 @@
+@@ -23696,8 +24474,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5897,7 +10037,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23752,8 +23745,7 @@
+@@ -23765,8 +24542,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5907,7 +10047,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23904,8 +23896,7 @@
+@@ -23917,8 +24693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5917,7 +10057,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24060,8 +24051,7 @@
+@@ -24073,8 +24848,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5927,7 +10067,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24126,8 +24116,7 @@
+@@ -24139,8 +24913,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5937,7 +10077,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24274,8 +24263,7 @@
+@@ -24287,8 +25060,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5947,7 +10087,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24430,8 +24418,7 @@
+@@ -24443,8 +25215,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5957,7 +10097,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24487,9 +24474,6 @@
+@@ -24500,9 +25271,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -5967,7 +10107,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24523,8 +24507,7 @@
+@@ -24536,8 +25304,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5977,7 +10117,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24628,8 +24611,7 @@
+@@ -24641,8 +25408,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5987,7 +10127,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24729,8 +24711,7 @@
+@@ -24742,8 +25508,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5997,7 +10137,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24804,8 +24785,7 @@
+@@ -24817,8 +25582,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6007,7 +10147,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24868,8 +24848,7 @@
+@@ -24881,8 +25645,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6017,7 +10157,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24931,8 +24910,7 @@
+@@ -24944,8 +25707,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6027,7 +10167,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24972,8 +24950,7 @@
+@@ -24985,8 +25747,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6037,7 +10177,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25029,8 +25006,7 @@
+@@ -25042,8 +25803,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6047,7 +10187,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25070,8 +25046,7 @@
+@@ -25083,8 +25843,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6057,7 +10197,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25135,8 +25110,7 @@
+@@ -25148,8 +25907,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6067,7 +10207,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25167,10 +25141,8 @@
+@@ -25180,10 +25938,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6080,7 +10220,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25281,8 +25253,7 @@
+@@ -25294,8 +26050,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6090,7 +10230,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25344,8 +25315,7 @@
+@@ -25357,8 +26112,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6100,7 +10240,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25385,8 +25355,7 @@
+@@ -25398,8 +26152,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6110,7 +10250,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25442,8 +25411,7 @@
+@@ -25455,8 +26208,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6120,7 +10260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25483,8 +25451,7 @@
+@@ -25496,8 +26248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6130,7 +10270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25548,8 +25515,7 @@
+@@ -25561,8 +26312,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6140,7 +10280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25580,10 +25546,8 @@
+@@ -25593,10 +26343,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6153,7 +10293,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25694,8 +25658,7 @@
+@@ -25707,8 +26455,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6163,7 +10303,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25757,8 +25720,7 @@
+@@ -25770,8 +26517,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6173,7 +10313,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25798,8 +25760,7 @@
+@@ -25811,8 +26557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6183,7 +10323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25855,8 +25816,7 @@
+@@ -25868,8 +26613,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6193,7 +10333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25896,8 +25856,7 @@
+@@ -25909,8 +26653,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6203,7 +10343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25961,8 +25920,7 @@
+@@ -25974,8 +26717,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6213,7 +10353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25993,10 +25951,8 @@
+@@ -26006,10 +26748,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6226,7 +10366,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26107,8 +26063,7 @@
+@@ -26120,8 +26860,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6236,7 +10376,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26170,8 +26125,7 @@
+@@ -26183,8 +26922,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6246,7 +10386,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26211,8 +26165,7 @@
+@@ -26224,8 +26962,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6256,7 +10396,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26268,8 +26221,7 @@
+@@ -26281,8 +27018,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6266,7 +10406,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26309,8 +26261,7 @@
+@@ -26322,8 +27058,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6276,7 +10416,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26374,8 +26325,7 @@
+@@ -26387,8 +27122,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6286,7 +10426,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26406,10 +26356,8 @@
+@@ -26419,10 +27153,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6299,7 +10439,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26528,8 +26476,7 @@
+@@ -26541,8 +27273,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6309,7 +10449,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26600,8 +26547,7 @@
+@@ -26613,8 +27344,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6319,7 +10459,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26671,8 +26617,7 @@
+@@ -26684,8 +27414,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6329,7 +10469,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26734,8 +26679,7 @@
+@@ -26747,8 +27476,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6339,7 +10479,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26775,8 +26719,7 @@
+@@ -26788,8 +27516,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6349,7 +10489,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26832,8 +26775,7 @@
+@@ -26845,8 +27572,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6359,7 +10499,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26873,8 +26815,7 @@
+@@ -26886,8 +27612,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6369,7 +10509,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26938,8 +26879,7 @@
+@@ -26951,8 +27676,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6379,7 +10519,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26970,10 +26910,8 @@
+@@ -26983,10 +27707,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6392,7 +10532,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27085,8 +27023,7 @@
+@@ -27098,8 +27820,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6402,7 +10542,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27148,8 +27085,7 @@
+@@ -27161,8 +27882,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6412,7 +10552,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27189,8 +27125,7 @@
+@@ -27202,8 +27922,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6422,7 +10562,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27246,8 +27181,7 @@
+@@ -27259,8 +27978,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6432,7 +10572,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27287,8 +27221,7 @@
+@@ -27300,8 +28018,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6442,7 +10582,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27352,8 +27285,7 @@
+@@ -27365,8 +28082,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6452,7 +10592,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27384,10 +27316,8 @@
+@@ -27397,10 +28113,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6465,7 +10605,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27498,8 +27428,7 @@
+@@ -27511,8 +28225,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6475,17 +10615,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27569,8 +27498,7 @@
+@@ -27593,8 +28306,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -27694,8 +28406,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27750,8 +27678,7 @@
+@@ -27875,8 +28586,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6495,7 +10645,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27860,8 +27787,7 @@
+@@ -27985,8 +28695,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6505,7 +10655,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28085,8 +28011,7 @@
+@@ -28210,8 +28919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6515,7 +10665,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28309,8 +28234,7 @@
+@@ -28434,8 +29142,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6525,7 +10675,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28386,8 +28310,7 @@
+@@ -28511,8 +29218,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6535,7 +10685,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28613,8 +28536,7 @@
+@@ -28738,8 +29444,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6545,7 +10695,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28689,8 +28611,7 @@
+@@ -28814,8 +29519,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6555,7 +10705,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28750,8 +28671,7 @@
+@@ -28875,8 +29579,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6565,7 +10715,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28834,8 +28754,7 @@
+@@ -28959,8 +29662,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6575,7 +10725,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28928,8 +28847,7 @@
+@@ -29053,8 +29755,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6585,7 +10735,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29103,8 +29021,7 @@
+@@ -29228,8 +29929,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6595,7 +10745,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29202,8 +29119,7 @@
+@@ -29327,8 +30027,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6605,7 +10755,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29296,8 +29212,7 @@
+@@ -29415,8 +30114,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6615,7 +10765,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29380,8 +29295,7 @@
+@@ -29493,8 +30191,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6625,25 +10775,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29434,7 +29348,7 @@
+@@ -29547,7 +30244,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29437: $i/$j" >&5
-+ echo "configure: 29351: $i/$j" >&5
+- echo "configure: 29550: $i/$j" >&5
++ echo "configure: 30247: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29737,7 +29651,7 @@
+@@ -29845,7 +30542,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29740: $i/$j" >&5
-+ echo "configure: 29654: $i/$j" >&5
+- echo "configure: 29848: $i/$j" >&5
++ echo "configure: 30545: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30414,8 +30328,7 @@
+@@ -30522,8 +31219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6653,47 +10803,98 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30574,7 +30487,7 @@
+@@ -30682,7 +31378,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30577: $i/$j" >&5
-+ echo "configure: 30490: $i/$j" >&5
+- echo "configure: 30685: $i/$j" >&5
++ echo "configure: 31381: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30604,7 +30517,7 @@
+@@ -30712,7 +31408,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30607: $i/$j" >&5
-+ echo "configure: 30520: $i/$j" >&5
+- echo "configure: 30715: $i/$j" >&5
++ echo "configure: 31411: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30622,7 +30535,7 @@
+@@ -30730,7 +31426,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30625: $i/$j" >&5
-+ echo "configure: 30538: $i/$j" >&5
+- echo "configure: 30733: $i/$j" >&5
++ echo "configure: 31429: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32140,7 +32053,7 @@
+@@ -32253,7 +32949,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32143: $i/$j" >&5
-+ echo "configure: 32056: $i/$j" >&5
+- echo "configure: 32256: $i/$j" >&5
++ echo "configure: 32952: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32297,290 +32210,6 @@
+@@ -32415,345 +33111,6 @@
- if test "x$GXX" = "xyes"; then
- kde_have_gcc_visibility=no
+
+
+- echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
+-echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
-
+- if test "x$GXX" = "xyes"; then
+-
+-
+- ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+- #include <exception>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "GCC visibility push" >/dev/null 2>&1; then
+-
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- kde_stdc_visibility_patched=yes
+-else
+-
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
+- visibility support. Disabling -fvisibility=hidden" >&5
+-echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
+- visibility support. Disabling -fvisibility=hidden" >&2;}
+-
+- kde_stdc_visibility_patched=no
+-fi
+-rm -f conftest*
+-
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+- kde_have_gcc_visibility=no
+-
-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
-kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
@@ -6861,7 +11062,7 @@
-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
-
-- if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+- if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-
- echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
@@ -6977,10 +11178,14 @@
-
-fi
-
- fi
+- fi
+-
+-
+-
-@@ -32647,8 +32276,7 @@
+ want_pam=
+@@ -32816,8 +33173,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6990,7 +11195,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32705,8 +32333,7 @@
+@@ -32874,8 +33230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7000,7 +11205,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32845,8 +32472,7 @@
+@@ -33014,8 +33369,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7010,7 +11215,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33086,8 +32712,7 @@
+@@ -33255,8 +33609,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7020,7 +11225,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33155,8 +32780,7 @@
+@@ -33324,8 +33677,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7030,7 +11235,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33251,8 +32875,7 @@
+@@ -33420,8 +33772,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7040,7 +11245,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33495,8 +33118,7 @@
+@@ -33664,8 +34015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7050,7 +11255,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33568,8 +33190,7 @@
+@@ -33737,8 +34087,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7060,7 +11265,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33623,8 +33244,7 @@
+@@ -33792,8 +34141,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7070,7 +11275,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33695,8 +33315,7 @@
+@@ -33864,8 +34212,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7080,7 +11285,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33750,8 +33369,7 @@
+@@ -33919,8 +34266,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7090,7 +11295,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33818,8 +33436,7 @@
+@@ -33987,8 +34333,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7100,7 +11305,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34023,8 +33640,7 @@
+@@ -34194,8 +34539,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7110,7 +11315,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34170,8 +33786,7 @@
+@@ -34340,8 +34684,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7120,7 +11325,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34234,8 +33849,7 @@
+@@ -34514,8 +34857,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7130,7 +11335,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34408,8 +34022,7 @@
+@@ -34574,8 +34916,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7140,7 +11345,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34468,8 +34081,7 @@
+@@ -34670,8 +35011,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7150,7 +11355,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34564,8 +34176,7 @@
+@@ -34737,8 +35077,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7160,7 +11365,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34631,8 +34242,7 @@
+@@ -34803,8 +35142,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7170,7 +11375,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34697,8 +34307,7 @@
+@@ -34867,8 +35205,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7180,7 +11385,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34761,8 +34370,7 @@
+@@ -34929,8 +35266,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7190,7 +11395,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34823,8 +34431,7 @@
+@@ -35000,8 +35336,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7200,7 +11405,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34894,8 +34501,7 @@
+@@ -35067,8 +35402,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7210,7 +11415,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34961,8 +34567,7 @@
+@@ -35134,8 +35468,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7220,7 +11425,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35028,8 +34633,7 @@
+@@ -35220,8 +35553,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7230,7 +11435,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35114,8 +34718,7 @@
+@@ -35326,8 +35658,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7240,7 +11445,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35220,8 +34823,7 @@
+@@ -35392,8 +35723,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7250,27 +11455,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35286,8 +34888,7 @@
+@@ -35468,8 +35798,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -35362,8 +34963,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35442,8 +35042,7 @@
+@@ -35548,8 +35877,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7280,7 +11475,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35632,8 +35231,7 @@
+@@ -35738,8 +36066,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7290,7 +11485,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35695,8 +35293,7 @@
+@@ -35801,8 +36128,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7300,7 +11495,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35736,8 +35333,7 @@
+@@ -35842,8 +36168,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7310,7 +11505,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35793,8 +35389,7 @@
+@@ -35899,8 +36224,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7320,7 +11515,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35834,8 +35429,7 @@
+@@ -35940,8 +36264,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7330,7 +11525,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35899,8 +35493,7 @@
+@@ -36005,8 +36328,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7340,7 +11535,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35931,10 +35524,8 @@
+@@ -36037,10 +36359,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7353,7 +11548,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36046,8 +35637,7 @@
+@@ -36152,8 +36472,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7363,7 +11558,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36109,8 +35699,7 @@
+@@ -36215,8 +36534,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7373,7 +11568,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36150,8 +35739,7 @@
+@@ -36256,8 +36574,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7383,7 +11578,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36207,8 +35795,7 @@
+@@ -36313,8 +36630,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7393,7 +11588,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36248,8 +35835,7 @@
+@@ -36354,8 +36670,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7403,7 +11598,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36313,8 +35899,7 @@
+@@ -36419,8 +36734,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7413,7 +11608,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36345,10 +35930,8 @@
+@@ -36451,10 +36765,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7426,7 +11621,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36460,8 +36043,7 @@
+@@ -36566,8 +36878,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7436,7 +11631,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36523,8 +36105,7 @@
+@@ -36629,8 +36940,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7446,7 +11641,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36564,8 +36145,7 @@
+@@ -36670,8 +36980,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7456,7 +11651,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36621,8 +36201,7 @@
+@@ -36727,8 +37036,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7466,7 +11661,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36662,8 +36241,7 @@
+@@ -36768,8 +37076,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7476,7 +11671,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36727,8 +36305,7 @@
+@@ -36833,8 +37140,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7486,7 +11681,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36759,10 +36336,8 @@
+@@ -36865,10 +37171,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7499,7 +11694,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36874,8 +36449,7 @@
+@@ -36980,8 +37284,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7509,7 +11704,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36937,8 +36511,7 @@
+@@ -37043,8 +37346,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7519,7 +11714,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36978,8 +36551,7 @@
+@@ -37084,8 +37386,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7529,7 +11724,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37035,8 +36607,7 @@
+@@ -37141,8 +37442,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7539,7 +11734,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37076,8 +36647,7 @@
+@@ -37182,8 +37482,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7549,7 +11744,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37141,8 +36711,7 @@
+@@ -37247,8 +37546,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7559,7 +11754,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37173,10 +36742,8 @@
+@@ -37279,10 +37577,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7572,7 +11767,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37291,8 +36858,7 @@
+@@ -37397,8 +37693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7582,7 +11777,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37334,8 +36900,7 @@
+@@ -37440,8 +37735,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7592,7 +11787,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37392,8 +36957,7 @@
+@@ -37498,8 +37792,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7602,7 +11797,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37575,8 +37139,7 @@
+@@ -37681,8 +37974,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7612,7 +11807,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37630,9 +37193,6 @@
+@@ -37736,9 +38028,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7622,7 +11817,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37666,8 +37226,7 @@
+@@ -37772,8 +38061,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7632,7 +11827,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37771,8 +37330,7 @@
+@@ -37877,8 +38165,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7642,7 +11837,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37851,9 +37409,6 @@
+@@ -37957,9 +38244,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7652,7 +11847,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37884,8 +37439,7 @@
+@@ -37990,8 +38274,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7662,7 +11857,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37986,8 +37540,7 @@
+@@ -38092,8 +38375,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7672,7 +11867,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38066,9 +37619,6 @@
+@@ -38172,9 +38454,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7682,7 +11877,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38099,8 +37649,7 @@
+@@ -38205,8 +38484,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7692,7 +11887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38201,8 +37750,7 @@
+@@ -38307,8 +38585,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7702,7 +11897,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38281,9 +37829,6 @@
+@@ -38387,9 +38664,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7712,7 +11907,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38319,8 +37864,7 @@
+@@ -38425,8 +38699,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7722,7 +11917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38427,8 +37971,7 @@
+@@ -38533,8 +38806,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7732,7 +11927,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38507,9 +38050,6 @@
+@@ -38613,9 +38885,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7742,7 +11937,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38544,8 +38084,7 @@
+@@ -38650,8 +38919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7752,7 +11947,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38650,8 +38189,7 @@
+@@ -38756,8 +39024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7762,7 +11957,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38730,9 +38268,6 @@
+@@ -38836,9 +39103,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7772,7 +11967,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38765,8 +38300,7 @@
+@@ -38871,8 +39135,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7782,7 +11977,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38869,8 +38403,7 @@
+@@ -38975,8 +39238,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7792,7 +11987,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38949,9 +38482,6 @@
+@@ -39055,9 +39317,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7802,7 +11997,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38984,8 +38514,7 @@
+@@ -39090,8 +39349,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7812,7 +12007,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39088,8 +38617,7 @@
+@@ -39194,8 +39452,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7822,7 +12017,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39167,9 +38695,6 @@
+@@ -39273,9 +39530,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7832,7 +12027,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39202,8 +38727,7 @@
+@@ -39308,8 +39562,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7842,7 +12037,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39306,8 +38830,7 @@
+@@ -39412,8 +39665,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7852,7 +12047,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39401,8 +38924,7 @@
+@@ -39507,8 +39759,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7862,7 +12057,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39589,8 +39111,7 @@
+@@ -39695,8 +39946,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7872,7 +12067,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39660,8 +39181,7 @@
+@@ -39766,8 +40016,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7882,7 +12077,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39814,8 +39334,7 @@
+@@ -39920,8 +40169,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7892,7 +12087,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40349,8 +39868,7 @@
+@@ -40455,8 +40703,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7902,7 +12097,15 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40642,8 +40160,7 @@
+@@ -40704,6 +40951,7 @@
+
+ XTESTLIB=
+
++
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
+@@ -40747,8 +40995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7912,7 +12115,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40788,8 +40305,7 @@
+@@ -40893,8 +41140,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7922,7 +12125,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40875,8 +40391,7 @@
+@@ -40980,8 +41226,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7932,7 +12135,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40938,8 +40453,7 @@
+@@ -41043,8 +41288,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7942,7 +12145,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41010,8 +40524,7 @@
+@@ -41115,8 +41359,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7952,7 +12155,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41101,8 +40614,7 @@
+@@ -41206,8 +41449,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7962,7 +12165,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41176,8 +40688,7 @@
+@@ -41281,8 +41523,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7972,7 +12175,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41287,8 +40798,7 @@
+@@ -41392,8 +41633,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7982,7 +12185,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41457,8 +40967,7 @@
+@@ -41562,8 +41802,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7992,16 +12195,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41520,7 +41029,7 @@
+@@ -41625,7 +41864,7 @@
do
for j in qsql.html;
do
-- echo "configure: 41523: $i/$j" >&5
-+ echo "configure: 41032: $i/$j" >&5
+- echo "configure: 41628: $i/$j" >&5
++ echo "configure: 41867: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -41864,8 +41373,7 @@
+@@ -41970,8 +42209,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8011,7 +12214,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41958,8 +41466,7 @@
+@@ -42064,8 +42302,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8021,16 +12224,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42131,7 +41638,7 @@
+@@ -42237,7 +42474,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 42134: $i/$j" >&5
-+ echo "configure: 41641: $i/$j" >&5
+- echo "configure: 42240: $i/$j" >&5
++ echo "configure: 42477: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -42186,8 +41693,7 @@
+@@ -42292,8 +42529,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8040,7 +12243,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42436,8 +41942,7 @@
+@@ -42542,8 +42778,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8050,7 +12253,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42486,8 +41991,7 @@
+@@ -42592,8 +42827,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8060,7 +12263,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42589,8 +42093,7 @@
+@@ -42696,8 +42930,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8070,7 +12273,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42655,8 +42158,7 @@
+@@ -42763,8 +42996,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8080,7 +12283,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42914,8 +42416,7 @@
+@@ -43022,8 +43254,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8090,7 +12293,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42980,8 +42481,7 @@
+@@ -43088,8 +43319,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8100,7 +12303,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43131,8 +42631,7 @@
+@@ -43239,8 +43469,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8110,7 +12313,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43285,8 +42784,7 @@
+@@ -43393,8 +43622,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8120,7 +12323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43390,8 +42888,7 @@
+@@ -43498,8 +43726,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8130,7 +12333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43510,8 +43007,7 @@
+@@ -43618,8 +43845,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8140,7 +12343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43636,8 +43132,7 @@
+@@ -43750,8 +43976,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8150,7 +12353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44024,8 +43519,7 @@
+@@ -44144,8 +44369,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8160,7 +12363,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44195,8 +43689,7 @@
+@@ -44315,8 +44539,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8170,7 +12373,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44248,13 +43741,13 @@
+@@ -44368,13 +44591,13 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -8188,7 +12391,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44286,8 +43779,7 @@
+@@ -44406,8 +44629,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8198,7 +12401,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44299,20 +43791,20 @@
+@@ -44419,20 +44641,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8224,7 +12427,7 @@
ac_font_enc_lib=1
else
ac_font_enc_lib=0
-@@ -44322,7 +43814,7 @@
+@@ -44442,7 +44664,7 @@
LIBS="$kde_save_LIBS"
if test "$ac_font_enc_lib" = "1"; then
@@ -8233,7 +12436,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_FONT_ENC 1
-@@ -44373,8 +43865,7 @@
+@@ -44493,8 +44715,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8243,7 +12446,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44604,8 +44095,7 @@
+@@ -44724,8 +44945,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8253,7 +12456,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44671,8 +44161,7 @@
+@@ -44791,8 +45011,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8263,7 +12466,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44718,8 +44207,7 @@
+@@ -44838,8 +45057,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8273,7 +12476,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44799,8 +44287,7 @@
+@@ -44919,8 +45137,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8283,7 +12486,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44890,8 +44377,7 @@
+@@ -45010,8 +45227,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8293,7 +12496,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45020,8 +44506,7 @@
+@@ -45139,8 +45355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8303,7 +12506,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45118,8 +44603,7 @@
+@@ -45237,8 +45452,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8313,7 +12516,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45206,8 +44690,7 @@
+@@ -45325,8 +45539,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8323,7 +12526,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45404,8 +44887,7 @@
+@@ -45533,8 +45746,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8333,7 +12536,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45606,8 +45088,7 @@
+@@ -45743,8 +45955,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8343,7 +12546,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45685,8 +45166,7 @@
+@@ -45822,8 +46033,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8353,7 +12556,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45749,8 +45229,7 @@
+@@ -45886,8 +46096,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8363,7 +12566,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45834,8 +45313,7 @@
+@@ -45971,8 +46180,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8373,7 +12576,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45915,8 +45393,7 @@
+@@ -46052,8 +46260,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8383,7 +12586,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46017,8 +45494,7 @@
+@@ -46154,8 +46361,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8393,7 +12596,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46081,8 +45557,7 @@
+@@ -46218,8 +46424,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8403,7 +12606,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46171,8 +45646,7 @@
+@@ -46308,8 +46513,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8413,7 +12616,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46282,8 +45756,7 @@
+@@ -46419,8 +46623,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8423,7 +12626,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46380,8 +45853,7 @@
+@@ -46517,8 +46720,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8433,7 +12636,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46612,8 +46084,7 @@
+@@ -46749,8 +46951,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8443,7 +12646,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46846,8 +46317,7 @@
+@@ -46981,8 +47182,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8453,7 +12656,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46947,8 +46417,7 @@
+@@ -47082,8 +47282,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8463,7 +12666,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47046,8 +46515,7 @@
+@@ -47181,8 +47380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8473,7 +12676,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47115,8 +46583,7 @@
+@@ -47250,8 +47448,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8483,7 +12686,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47160,8 +46627,7 @@
+@@ -47295,8 +47492,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8493,7 +12696,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47227,8 +46693,7 @@
+@@ -47362,8 +47558,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8503,7 +12706,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47272,8 +46737,7 @@
+@@ -47407,8 +47602,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8513,7 +12716,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47342,8 +46806,7 @@
+@@ -47477,8 +47671,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8523,7 +12726,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47390,8 +46853,7 @@
+@@ -47525,8 +47718,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8533,7 +12736,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47501,8 +46963,7 @@
+@@ -47636,8 +47828,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8543,7 +12746,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47609,8 +47070,7 @@
+@@ -47744,8 +47935,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8553,7 +12756,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47712,8 +47172,7 @@
+@@ -47847,8 +48037,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8563,7 +12766,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47824,8 +47283,7 @@
+@@ -47959,8 +48148,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8573,7 +12776,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47891,8 +47349,7 @@
+@@ -48029,8 +48217,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8583,7 +12786,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47969,8 +47426,7 @@
+@@ -48106,8 +48293,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8593,7 +12796,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48026,8 +47482,7 @@
+@@ -48163,8 +48349,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8603,7 +12806,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48136,8 +47591,7 @@
+@@ -48270,8 +48455,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8613,7 +12816,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48246,8 +47700,7 @@
+@@ -48380,8 +48564,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8623,7 +12826,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48350,8 +47803,7 @@
+@@ -48484,8 +48667,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8633,7 +12836,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48419,8 +47871,7 @@
+@@ -48553,8 +48735,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8643,7 +12846,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48510,8 +47961,7 @@
+@@ -48644,8 +48825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8653,7 +12856,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48687,8 +48137,7 @@
+@@ -48821,8 +49001,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8663,7 +12866,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48994,8 +48443,7 @@
+@@ -49129,8 +49308,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8673,7 +12876,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49078,8 +48526,7 @@
+@@ -49274,8 +49452,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8683,16 +12886,56 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49238,7 +48685,7 @@
+@@ -49429,8 +49606,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -49516,8 +49692,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -49598,8 +49773,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -49685,8 +49859,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -49771,7 +49944,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 49241: $i/$j" >&5
-+ echo "configure: 48688: $i/$j" >&5
+- echo "configure: 49774: $i/$j" >&5
++ echo "configure: 49947: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -49293,8 +48740,7 @@
+@@ -49826,8 +49999,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8702,7 +12945,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49531,8 +48977,7 @@
+@@ -50064,8 +50236,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8712,7 +12955,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49704,8 +49149,7 @@
+@@ -50237,8 +50408,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8722,7 +12965,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49876,8 +49320,7 @@
+@@ -50409,8 +50579,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8732,7 +12975,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49969,8 +49412,7 @@
+@@ -50502,8 +50671,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8742,7 +12985,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50059,8 +49501,7 @@
+@@ -50592,8 +50760,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8752,7 +12995,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50149,8 +49590,7 @@
+@@ -50682,8 +50849,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8762,7 +13005,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50244,8 +49684,7 @@
+@@ -50777,8 +50943,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8772,7 +13015,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50350,8 +49789,7 @@
+@@ -50882,8 +51047,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8782,7 +13025,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50540,8 +49978,7 @@
+@@ -51072,8 +51236,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8792,25 +13035,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50599,7 +50036,7 @@
+@@ -51131,7 +51294,7 @@
do
for j in ldap.h;
do
-- echo "configure: 50602: $i/$j" >&5
-+ echo "configure: 50039: $i/$j" >&5
+- echo "configure: 51134: $i/$j" >&5
++ echo "configure: 51297: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_incdir=$i
-@@ -50621,7 +50058,7 @@
+@@ -51153,7 +51316,7 @@
do
for j in libldap.$ext;
do
-- echo "configure: 50624: $i/$j" >&5
-+ echo "configure: 50061: $i/$j" >&5
+- echo "configure: 51156: $i/$j" >&5
++ echo "configure: 51319: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_libdir=$i
-@@ -50718,8 +50155,7 @@
+@@ -51249,8 +51412,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8820,7 +13063,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50816,8 +50252,7 @@
+@@ -51343,8 +51505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8830,70 +13073,98 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50975,7 +50410,7 @@
+@@ -51439,8 +51600,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -51587,7 +51747,7 @@
do
for j in libhal.h libhal-storage.h;
do
-- echo "configure: 50978: $i/$j" >&5
-+ echo "configure: 50413: $i/$j" >&5
+- echo "configure: 51590: $i/$j" >&5
++ echo "configure: 51750: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_incdir=$i
-@@ -50997,7 +50432,7 @@
+@@ -51622,7 +51782,7 @@
do
for j in libhal.so libhal-storage.so;
do
-- echo "configure: 51000: $i/$j" >&5
-+ echo "configure: 50435: $i/$j" >&5
+- echo "configure: 51625: $i/$j" >&5
++ echo "configure: 51785: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_libdir=$i
-@@ -51051,7 +50486,7 @@
+@@ -51775,7 +51935,7 @@
do
for j in dbus/dbus.h;
do
-- echo "configure: 51054: $i/$j" >&5
-+ echo "configure: 50489: $i/$j" >&5
+- echo "configure: 51778: $i/$j" >&5
++ echo "configure: 51938: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir=$i
-@@ -51068,7 +50503,7 @@
+@@ -51792,7 +51952,7 @@
do
for j in dbus/dbus-arch-deps.h;
do
-- echo "configure: 51071: $i/$j" >&5
-+ echo "configure: 50506: $i/$j" >&5
+- echo "configure: 51795: $i/$j" >&5
++ echo "configure: 51955: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir_arch_deps=$i
-@@ -51090,7 +50525,7 @@
+@@ -51814,7 +51974,7 @@
do
for j in libdbus-1.so;
do
-- echo "configure: 51093: $i/$j" >&5
-+ echo "configure: 50528: $i/$j" >&5
+- echo "configure: 51817: $i/$j" >&5
++ echo "configure: 51977: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_libdir=$i
-@@ -51133,7 +50568,7 @@
+@@ -51964,7 +52124,7 @@
do
for j in dbus/connection.h;
do
-- echo "configure: 51136: $i/$j" >&5
-+ echo "configure: 50571: $i/$j" >&5
+- echo "configure: 51967: $i/$j" >&5
++ echo "configure: 52127: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_incdir=$i
-@@ -51160,7 +50595,7 @@
+@@ -51991,7 +52151,7 @@
do
for j in libdbus-qt-1.so;
do
-- echo "configure: 51163: $i/$j" >&5
-+ echo "configure: 50598: $i/$j" >&5
+- echo "configure: 51994: $i/$j" >&5
++ echo "configure: 52154: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_libdir=$i
-@@ -51274,8 +50709,7 @@
+@@ -52015,7 +52175,7 @@
+ do
+ for j in dbus/connection.h;
+ do
+- echo "configure: 52018: $i/$j" >&5
++ echo "configure: 52178: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ dbusqt_incdir=$i
+@@ -52041,7 +52201,7 @@
+ do
+ for j in libdbus-qt-1.so;
+ do
+- echo "configure: 52044: $i/$j" >&5
++ echo "configure: 52204: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ dbusqt_libdir=$i
+@@ -52167,8 +52327,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8903,7 +13174,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51304,8 +50738,7 @@
+@@ -52197,8 +52356,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8913,7 +13184,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51375,8 +50808,7 @@
+@@ -52268,8 +52426,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8923,7 +13194,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51428,8 +50860,7 @@
+@@ -52321,8 +52478,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8933,7 +13204,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51500,8 +50931,7 @@
+@@ -52393,8 +52549,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8943,7 +13214,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51553,8 +50983,7 @@
+@@ -52446,8 +52601,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8953,7 +13224,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51644,8 +51073,7 @@
+@@ -52549,8 +52703,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8963,7 +13234,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51814,8 +51242,7 @@
+@@ -52719,8 +52872,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8973,7 +13244,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51932,8 +51359,7 @@
+@@ -52826,8 +52978,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8983,7 +13254,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52008,8 +51434,7 @@
+@@ -52902,8 +53053,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8993,7 +13264,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52172,8 +51597,7 @@
+@@ -53091,8 +53241,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9003,7 +13274,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52295,8 +51719,7 @@
+@@ -53221,8 +53370,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9013,7 +13284,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52382,8 +51805,7 @@
+@@ -53308,8 +53456,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9023,7 +13294,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52451,8 +51873,7 @@
+@@ -53377,8 +53524,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9033,7 +13304,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52507,8 +51928,7 @@
+@@ -53433,8 +53579,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9043,7 +13314,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53132,8 +52552,7 @@
+@@ -54058,8 +54203,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9053,7 +13324,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53212,8 +52631,7 @@
+@@ -54138,8 +54282,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9063,7 +13334,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53276,8 +52694,7 @@
+@@ -54202,8 +54345,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9073,27 +13344,37 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53474,8 +52891,7 @@
+@@ -54413,8 +54555,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -54584,8 +54725,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53577,8 +52993,7 @@
+@@ -54695,8 +54835,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
+- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53747,8 +53162,7 @@
+@@ -54795,8 +54934,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9103,7 +13384,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53834,8 +53248,7 @@
+@@ -54882,8 +55020,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9113,7 +13394,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53921,8 +53334,7 @@
+@@ -54969,8 +55106,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9123,7 +13404,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -54020,8 +53432,7 @@
+@@ -55068,8 +55204,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9133,7 +13414,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -54177,8 +53588,7 @@
+@@ -55225,8 +55360,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9143,7 +13424,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -54258,8 +53668,7 @@
+@@ -55306,8 +55440,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9153,7 +13434,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -55824,6 +55233,13 @@
+@@ -56904,6 +57037,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -9167,7 +13448,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -57401,6 +56817,9 @@
+@@ -58506,6 +58646,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -9177,7 +13458,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -57970,11 +57389,6 @@
+@@ -59091,11 +59234,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -9189,7 +13470,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -58013,6 +57427,12 @@
+@@ -59134,6 +59272,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -9204,16 +13485,18 @@
sed "$ac_vpsub
--- configure.in
+++ configure.in
-@@ -42,6 +42,8 @@
+@@ -40,7 +40,9 @@
+ AC_ARG_PROGRAM
+
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdebase, "3.4.3") dnl searches for some needed programs
+-AM_INIT_AUTOMAKE(kdebase, "3.5") dnl searches for some needed programs
++AM_INIT_AUTOMAKE(kdebase.0, "3.5") dnl searches for some needed programs
++
++AM_MAINTAINER_MODE
-+AM_MAINTAINER_MODE
-+
KDE_SET_PREFIX
- dnl generate the config header
-@@ -608,9 +610,9 @@
+@@ -611,9 +613,9 @@
ld_shared_flag=
KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
LDFLAGS="$LDFLAGS $ld_shared_flag $all_libraries -lz"
@@ -9227,7 +13510,7 @@
LDFLAGS="$ac_LDFLAGS_save"
--- doc/faq/Makefile.in
+++ doc/faq/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9237,7 +13520,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9246,7 +13529,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9258,46 +13541,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -710,10 +713,10 @@
+@@ -726,10 +729,10 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=desktop.docbook about.docbook winmng.docbook tips.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook configkde.docbook install.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2
-+KDE_DIST=desktop.docbook about.docbook winmng.docbook tips.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook install.docbook configkde.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2
+-KDE_DIST=desktop.docbook about.docbook winmng.docbook qt.docbook tips.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook configkde.docbook install.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2
++KDE_DIST=desktop.docbook about.docbook winmng.docbook tips.docbook qt.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook install.docbook configkde.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO configkde.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -756,20 +759,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
-- @for base in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
-+ @for base in TODO configkde.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
+- @for base in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
++ @for base in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
done
uninstall-nls:
-- for base in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
-+ for base in TODO configkde.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
+- for base in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
++ for base in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
done
#>+ 5
distdir-nls:
-- for file in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
-+ for file in TODO configkde.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
+- for file in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
++ for file in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/glossary/Makefile.in
+++ doc/glossary/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9307,7 +13590,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9316,7 +13599,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9328,7 +13611,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -713,7 +716,7 @@
+@@ -729,7 +732,7 @@
KDE_DIST=kdeprintingglossary.docbook index.docbook Makefile.in checkxrefs Makefile.am index.cache.bz2
#>+ 24
@@ -9337,7 +13620,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -756,20 +759,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary
@@ -9363,7 +13646,7 @@
--- doc/kappfinder/Makefile.in
+++ doc/kappfinder/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9373,7 +13656,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -542,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9382,7 +13665,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9396,7 +13679,7 @@
mostlyclean-libtool:
--- doc/kate/Makefile.in
+++ doc/kate/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9406,7 +13689,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -542,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9415,7 +13698,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9427,42 +13710,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -713,7 +716,7 @@
- KDE_DIST=configuring.docbook plugins.docbook index.docbook regular-expressions.docbook mdi.docbook configdialog02.png fundamentals.docbook Makefile.in unhighlighted.png part.docbook highlighting.docbook menus.docbook configdialog01.png advanced.docbook highlighted.png Makefile.am kate.png mimetypechooser.png index.cache.bz2
+@@ -730,7 +733,7 @@
+ KDE_DIST=configuring.docbook plugins.docbook index.docbook regular-expressions.docbook mdi.docbook configdialog02.png fundamentals.docbook Makefile.in man-kate.1.docbook unhighlighted.png part.docbook highlighting.docbook menus.docbook configdialog01.png advanced.docbook highlighted.png Makefile.am kate.png mimetypechooser.png index.cache.bz2
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png plugins.docbook fundamentals.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -757,20 +760,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
-- @for base in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png plugins.docbook fundamentals.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png ; do \
-+ @for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
+- @for base in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
++ @for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
done
uninstall-nls:
-- for base in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png plugins.docbook fundamentals.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png ; do \
-+ for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
+- for base in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
++ for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
done
#>+ 5
distdir-nls:
-- for file in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png plugins.docbook fundamentals.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png ; do \
-+ for file in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
+- for file in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
++ for file in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/kcontrol/arts/Makefile.in
+++ doc/kcontrol/arts/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9472,7 +13755,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9481,7 +13764,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9493,7 +13776,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -713,7 +716,7 @@
+@@ -729,7 +732,7 @@
KDE_DIST=midi.docbook index.docbook Makefile.in Makefile.am index.cache.bz2
#>+ 24
@@ -9502,7 +13785,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -756,20 +759,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts
@@ -9528,7 +13811,7 @@
--- doc/kcontrol/background/Makefile.in
+++ doc/kcontrol/background/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9538,7 +13821,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9547,7 +13830,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9561,7 +13844,7 @@
mostlyclean-libtool:
--- doc/kcontrol/bell/Makefile.in
+++ doc/kcontrol/bell/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9571,7 +13854,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9580,7 +13863,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9594,7 +13877,7 @@
mostlyclean-libtool:
--- doc/kcontrol/cache/Makefile.in
+++ doc/kcontrol/cache/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9604,7 +13887,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9613,7 +13896,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9627,7 +13910,7 @@
mostlyclean-libtool:
--- doc/kcontrol/clock/Makefile.in
+++ doc/kcontrol/clock/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9637,7 +13920,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9646,7 +13929,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9660,7 +13943,7 @@
mostlyclean-libtool:
--- doc/kcontrol/colors/Makefile.in
+++ doc/kcontrol/colors/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9670,7 +13953,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9679,7 +13962,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9693,7 +13976,7 @@
mostlyclean-libtool:
--- doc/kcontrol/cookies/Makefile.in
+++ doc/kcontrol/cookies/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9703,7 +13986,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9712,7 +13995,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9726,7 +14009,7 @@
mostlyclean-libtool:
--- doc/kcontrol/crypto/Makefile.in
+++ doc/kcontrol/crypto/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9736,7 +14019,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9745,7 +14028,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9759,7 +14042,7 @@
mostlyclean-libtool:
--- doc/kcontrol/desktop/Makefile.in
+++ doc/kcontrol/desktop/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9769,7 +14052,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9778,7 +14061,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9792,7 +14075,7 @@
mostlyclean-libtool:
--- doc/kcontrol/desktopbehavior/Makefile.in
+++ doc/kcontrol/desktopbehavior/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9802,7 +14085,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9811,7 +14094,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9825,7 +14108,7 @@
mostlyclean-libtool:
--- doc/kcontrol/ebrowsing/Makefile.in
+++ doc/kcontrol/ebrowsing/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9835,7 +14118,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9844,7 +14127,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9858,7 +14141,7 @@
mostlyclean-libtool:
--- doc/kcontrol/email/Makefile.in
+++ doc/kcontrol/email/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9868,7 +14151,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9877,7 +14160,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9891,7 +14174,7 @@
mostlyclean-libtool:
--- doc/kcontrol/energy/Makefile.in
+++ doc/kcontrol/energy/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9901,7 +14184,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9910,7 +14193,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9924,7 +14207,7 @@
mostlyclean-libtool:
--- doc/kcontrol/filemanager/Makefile.in
+++ doc/kcontrol/filemanager/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9934,7 +14217,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9943,7 +14226,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9955,7 +14238,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -713,7 +716,7 @@
+@@ -729,7 +732,7 @@
KDE_DIST=kfileman1.png index.docbook Makefile.in kfileman2.png Makefile.am index.cache.bz2
#>+ 24
@@ -9964,7 +14247,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -756,20 +759,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager
@@ -9990,7 +14273,7 @@
--- doc/kcontrol/filetypes/Makefile.in
+++ doc/kcontrol/filetypes/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10000,7 +14283,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10009,7 +14292,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10023,7 +14306,7 @@
mostlyclean-libtool:
--- doc/kcontrol/fonts/Makefile.in
+++ doc/kcontrol/fonts/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10033,7 +14316,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10042,7 +14325,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10056,7 +14339,7 @@
mostlyclean-libtool:
--- doc/kcontrol/helpindex/Makefile.in
+++ doc/kcontrol/helpindex/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10066,7 +14349,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10075,7 +14358,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10089,7 +14372,7 @@
mostlyclean-libtool:
--- doc/kcontrol/icons/Makefile.in
+++ doc/kcontrol/icons/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10099,7 +14382,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10108,7 +14391,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10122,7 +14405,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmaccess/Makefile.in
+++ doc/kcontrol/kcmaccess/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10132,7 +14415,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10141,7 +14424,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10155,7 +14438,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmcss/Makefile.in
+++ doc/kcontrol/kcmcss/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10165,7 +14448,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10174,7 +14457,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10188,7 +14471,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmfontinst/Makefile.in
+++ doc/kcontrol/kcmfontinst/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10198,7 +14481,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10207,7 +14490,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10221,7 +14504,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmkonsole/Makefile.in
+++ doc/kcontrol/kcmkonsole/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10231,7 +14514,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10240,7 +14523,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10254,7 +14537,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmlaunch/Makefile.in
+++ doc/kcontrol/kcmlaunch/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10264,7 +14547,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10273,7 +14556,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10287,7 +14570,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmnotify/Makefile.in
+++ doc/kcontrol/kcmnotify/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10297,7 +14580,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10306,7 +14589,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10320,7 +14603,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmsmserver/Makefile.in
+++ doc/kcontrol/kcmsmserver/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10330,7 +14613,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10339,7 +14622,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10353,7 +14636,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmstyle/Makefile.in
+++ doc/kcontrol/kcmstyle/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10363,7 +14646,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10372,7 +14655,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10386,7 +14669,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmtaskbar/Makefile.in
+++ doc/kcontrol/kcmtaskbar/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10396,7 +14679,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10405,7 +14688,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10419,7 +14702,7 @@
mostlyclean-libtool:
--- doc/kcontrol/kdm/Makefile.in
+++ doc/kcontrol/kdm/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10429,7 +14712,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10438,7 +14721,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10452,7 +14735,7 @@
mostlyclean-libtool:
--- doc/kcontrol/keyboard/Makefile.in
+++ doc/kcontrol/keyboard/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10462,7 +14745,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10471,7 +14754,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10485,7 +14768,7 @@
mostlyclean-libtool:
--- doc/kcontrol/keys/Makefile.in
+++ doc/kcontrol/keys/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10495,7 +14778,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10504,7 +14787,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10518,7 +14801,7 @@
mostlyclean-libtool:
--- doc/kcontrol/khtml/Makefile.in
+++ doc/kcontrol/khtml/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10528,7 +14811,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10537,7 +14820,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10549,7 +14832,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -713,7 +716,7 @@
+@@ -729,7 +732,7 @@
KDE_DIST=index.docbook nsplugin.docbook Makefile.in Makefile.am index.cache.bz2
#>+ 24
@@ -10558,7 +14841,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -756,20 +759,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml
@@ -10584,7 +14867,7 @@
--- doc/kcontrol/kwindecoration/Makefile.in
+++ doc/kcontrol/kwindecoration/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10594,7 +14877,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10603,7 +14886,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10617,7 +14900,7 @@
mostlyclean-libtool:
--- doc/kcontrol/language/Makefile.in
+++ doc/kcontrol/language/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10627,7 +14910,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10636,7 +14919,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10650,7 +14933,7 @@
mostlyclean-libtool:
--- doc/kcontrol/Makefile.in
+++ doc/kcontrol/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10660,16 +14943,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
xdg_menudir = @xdg_menudir@
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
--SUBDIRS =. background khtml helpindex proxy kcmtaskbar language passwords email fonts desktopbehavior cookies useragent kcmfontinst ebrowsing panel cache filetypes windowmanagement kcmlaunch arts desktop filemanager bell panelappearance crypto kwindecoration screensaver smb kcmcss mouse energy kcmstyle clock kcmaccess keyboard kcmsmserver colors kcmnotify netpref kcmkonsole keys kdm icons spellchecking
-+SUBDIRS =. kdm smb spellchecking bell arts keys cookies filetypes desktop cache clock email fonts icons khtml filemanager mouse panel proxy desktopbehavior passwords panelappearance ebrowsing background kcmaccess colors crypto energy kcmstyle netpref kcmlaunch kcmcss kcmnotify kcmsmserver screensaver windowmanagement kwindecoration kcmkonsole language useragent helpindex keyboard kcmtaskbar kcmfontinst
+-SUBDIRS =. background khtml helpindex proxy kcmtaskbar language passwords email fonts desktopbehavior cookies useragent kcmfontinst ebrowsing panel cache filetypes windowmanagement kcmlaunch arts desktop filemanager bell panelappearance crypto kwindecoration screensaver smb kcmcss mouse energy kcmstyle clock kcmaccess keyboard kcmsmserver colors performance kcmnotify netpref kcmkonsole keys kdm icons spellchecking
++SUBDIRS =. kdm smb spellchecking bell arts keys cookies filetypes desktop cache clock email fonts icons khtml filemanager mouse panel proxy desktopbehavior passwords panelappearance ebrowsing background kcmaccess colors crypto energy kcmstyle netpref kcmlaunch kcmcss kcmnotify kcmsmserver screensaver windowmanagement kwindecoration kcmkonsole language useragent helpindex keyboard kcmtaskbar kcmfontinst performance
KDE_LANG = en
KDE_DOCS = AUTO
#>- all: all-recursive
-@@ -544,7 +547,7 @@
+@@ -560,7 +563,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -10678,7 +14961,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -598,9 +601,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10690,7 +14973,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -880,7 +883,7 @@
+@@ -896,7 +899,7 @@
KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2
#>+ 24
@@ -10699,7 +14982,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -907,20 +910,20 @@
+@@ -923,20 +926,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol
@@ -10725,7 +15008,7 @@
--- doc/kcontrol/mouse/Makefile.in
+++ doc/kcontrol/mouse/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10735,7 +15018,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10744,7 +15027,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10758,7 +15041,7 @@
mostlyclean-libtool:
--- doc/kcontrol/netpref/Makefile.in
+++ doc/kcontrol/netpref/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10768,7 +15051,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10777,7 +15060,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10791,7 +15074,7 @@
mostlyclean-libtool:
--- doc/kcontrol/panel/Makefile.in
+++ doc/kcontrol/panel/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10801,7 +15084,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10810,7 +15093,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10824,7 +15107,7 @@
mostlyclean-libtool:
--- doc/kcontrol/panelappearance/Makefile.in
+++ doc/kcontrol/panelappearance/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10834,7 +15117,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10843,7 +15126,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10857,7 +15140,7 @@
mostlyclean-libtool:
--- doc/kcontrol/passwords/Makefile.in
+++ doc/kcontrol/passwords/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10867,7 +15150,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10876,7 +15159,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10888,9 +15171,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+--- doc/kcontrol/performance/Makefile.in
++++ doc/kcontrol/performance/Makefile.in
+@@ -250,6 +250,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -541,7 +544,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -579,9 +582,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- doc/kcontrol/proxy/Makefile.in
+++ doc/kcontrol/proxy/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10900,7 +15216,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10909,7 +15225,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10923,7 +15239,7 @@
mostlyclean-libtool:
--- doc/kcontrol/screensaver/Makefile.in
+++ doc/kcontrol/screensaver/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10933,7 +15249,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10942,7 +15258,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10956,7 +15272,7 @@
mostlyclean-libtool:
--- doc/kcontrol/smb/Makefile.in
+++ doc/kcontrol/smb/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10966,7 +15282,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10975,7 +15291,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10989,7 +15305,7 @@
mostlyclean-libtool:
--- doc/kcontrol/spellchecking/Makefile.in
+++ doc/kcontrol/spellchecking/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10999,7 +15315,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11008,7 +15324,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11022,7 +15338,7 @@
mostlyclean-libtool:
--- doc/kcontrol/useragent/Makefile.in
+++ doc/kcontrol/useragent/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11032,7 +15348,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11041,7 +15357,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11055,7 +15371,7 @@
mostlyclean-libtool:
--- doc/kcontrol/windowmanagement/Makefile.in
+++ doc/kcontrol/windowmanagement/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11065,7 +15381,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11074,7 +15390,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11088,7 +15404,7 @@
mostlyclean-libtool:
--- doc/kdcop/Makefile.in
+++ doc/kdcop/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11098,7 +15414,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11107,7 +15423,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11121,7 +15437,7 @@
mostlyclean-libtool:
--- doc/kdebugdialog/Makefile.in
+++ doc/kdebugdialog/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11131,7 +15447,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11140,7 +15456,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11154,7 +15470,7 @@
mostlyclean-libtool:
--- doc/kdeprint/Makefile.in
+++ doc/kdeprint/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11164,7 +15480,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11173,7 +15489,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11185,7 +15501,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -710,10 +713,10 @@
+@@ -726,10 +729,10 @@
.NOEXPORT:
#>+ 2
@@ -11198,7 +15514,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -756,20 +759,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
@@ -11224,7 +15540,7 @@
--- doc/kdesu/Makefile.in
+++ doc/kdesu/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11234,7 +15550,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -542,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11243,7 +15559,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11257,7 +15573,7 @@
mostlyclean-libtool:
--- doc/kdm/Makefile.in
+++ doc/kdm/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11267,7 +15583,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -542,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11276,7 +15592,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11290,7 +15606,7 @@
mostlyclean-libtool:
--- doc/kfind/Makefile.in
+++ doc/kfind/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11300,7 +15616,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -542,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11309,7 +15625,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11323,7 +15639,7 @@
mostlyclean-libtool:
--- doc/khelpcenter/Makefile.in
+++ doc/khelpcenter/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11333,7 +15649,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -560,7 +563,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11342,7 +15658,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -598,9 +601,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11354,7 +15670,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -880,7 +883,7 @@
+@@ -896,7 +899,7 @@
KDE_DIST=whatiskde.docbook kdelogo2.png support.docbook index.docbook khelpcenter.png shadow1.png pointers.png konq.css Makefile.in lines2.png help.docbook lines.png welcome.docbook contact.docbook Makefile.am background.png index.cache.bz2 bgtable.png
#>+ 24
@@ -11363,7 +15679,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -907,20 +910,20 @@
+@@ -923,20 +926,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter
@@ -11389,7 +15705,7 @@
--- doc/kicker/Makefile.in
+++ doc/kicker/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11399,7 +15715,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -542,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11408,7 +15724,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11420,46 +15736,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -710,10 +713,10 @@
+@@ -727,10 +730,10 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=k_menu_icon.png screenshot_right.png bookmarks_icon.png index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2
-+KDE_DIST=k_menu_icon.png bookmarks_icon.png screenshot_right.png index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2
+-KDE_DIST=k_menu_icon.png man-appletproxy.1.docbook screenshot_right.png bookmarks_icon.png man-kicker.1.docbook index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2
++KDE_DIST=k_menu_icon.png bookmarks_icon.png screenshot_right.png man-appletproxy.1.docbook man-kicker.1.docbook index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) quickbrowser_icon.png bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) quickbrowser_icon.png taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -757,20 +760,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker
-- @for base in quickbrowser_icon.png bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png ; do \
-+ @for base in quickbrowser_icon.png taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
+- @for base in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
++ @for base in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
done
uninstall-nls:
-- for base in quickbrowser_icon.png bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png ; do \
-+ for base in quickbrowser_icon.png taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
+- for base in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
++ for base in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
done
#>+ 5
distdir-nls:
-- for file in quickbrowser_icon.png bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png ; do \
-+ for file in quickbrowser_icon.png taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
+- for file in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
++ for file in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/kinfocenter/devices/Makefile.in
+++ doc/kinfocenter/devices/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11469,7 +15785,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11478,7 +15794,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11492,7 +15808,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/dma/Makefile.in
+++ doc/kinfocenter/dma/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11502,7 +15818,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11511,7 +15827,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11525,7 +15841,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/interrupts/Makefile.in
+++ doc/kinfocenter/interrupts/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11535,7 +15851,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11544,7 +15860,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11558,7 +15874,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/ioports/Makefile.in
+++ doc/kinfocenter/ioports/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11568,7 +15884,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11577,7 +15893,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11591,7 +15907,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/Makefile.in
+++ doc/kinfocenter/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11601,7 +15917,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
xdg_menudir = @xdg_menudir@
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -11610,7 +15926,7 @@
KDE_LANG = en
KDE_DOCS = AUTO
#>- all: all-recursive
-@@ -544,7 +547,7 @@
+@@ -560,7 +563,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11619,7 +15935,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -598,9 +601,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11633,7 +15949,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/memory/Makefile.in
+++ doc/kinfocenter/memory/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11643,7 +15959,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11652,7 +15968,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11666,7 +15982,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/nics/Makefile.in
+++ doc/kinfocenter/nics/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11676,7 +15992,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11685,7 +16001,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11699,7 +16015,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/opengl/Makefile.in
+++ doc/kinfocenter/opengl/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11709,7 +16025,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11718,7 +16034,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11732,7 +16048,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/partitions/Makefile.in
+++ doc/kinfocenter/partitions/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11742,7 +16058,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11751,7 +16067,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11765,7 +16081,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/pci/Makefile.in
+++ doc/kinfocenter/pci/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11775,7 +16091,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11784,7 +16100,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11798,7 +16114,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/pcmcia/Makefile.in
+++ doc/kinfocenter/pcmcia/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11808,7 +16124,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11817,7 +16133,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11831,7 +16147,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/processor/Makefile.in
+++ doc/kinfocenter/processor/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11841,7 +16157,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11850,7 +16166,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11864,7 +16180,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/protocols/Makefile.in
+++ doc/kinfocenter/protocols/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11874,7 +16190,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11883,7 +16199,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11897,7 +16213,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/samba/Makefile.in
+++ doc/kinfocenter/samba/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11907,7 +16223,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11916,7 +16232,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11930,7 +16246,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/scsi/Makefile.in
+++ doc/kinfocenter/scsi/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11940,7 +16256,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11949,7 +16265,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11963,7 +16279,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/sound/Makefile.in
+++ doc/kinfocenter/sound/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11973,7 +16289,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11982,7 +16298,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11996,7 +16312,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/usb/Makefile.in
+++ doc/kinfocenter/usb/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12006,7 +16322,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12015,7 +16331,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12029,7 +16345,7 @@
mostlyclean-libtool:
--- doc/kinfocenter/xserver/Makefile.in
+++ doc/kinfocenter/xserver/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12039,7 +16355,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12048,7 +16364,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12062,7 +16378,7 @@
mostlyclean-libtool:
--- doc/kioslave/Makefile.in
+++ doc/kioslave/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12072,7 +16388,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12081,7 +16397,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12093,7 +16409,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -710,10 +713,10 @@
+@@ -726,10 +729,10 @@
.NOEXPORT:
#>+ 2
@@ -12106,7 +16422,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -756,20 +759,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave
@@ -12132,7 +16448,7 @@
--- doc/klipper/Makefile.in
+++ doc/klipper/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12142,7 +16458,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12151,7 +16467,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12165,7 +16481,7 @@
mostlyclean-libtool:
--- doc/kmenuedit/Makefile.in
+++ doc/kmenuedit/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12175,7 +16491,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12184,7 +16500,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12196,42 +16512,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -713,7 +716,7 @@
- KDE_DIST=i_paste.png i_delete.png index.docbook i_copy.png i_new_submenu.png Makefile.in i_cut.png i_k_button.png i_new_item.png icon_sets.png Makefile.am index.cache.bz2
+@@ -729,7 +732,7 @@
+ KDE_DIST=done.png new.png index.docbook selectinternet.png itemname.png Makefile.in kmenueditmain.png selecticon.png Makefile.am index.cache.bz2
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) i_new_submenu.png i_k_button.png i_new_item.png index.docbook i_copy.png i_cut.png icon_sets.png i_paste.png i_delete.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) i_new_submenu.png i_k_button.png icon_sets.png i_copy.png i_cut.png i_delete.png i_paste.png index.docbook i_new_item.png
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -756,20 +759,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit
-- @for base in i_new_submenu.png i_k_button.png i_new_item.png index.docbook i_copy.png i_cut.png icon_sets.png i_paste.png i_delete.png ; do \
-+ @for base in i_new_submenu.png i_k_button.png icon_sets.png i_copy.png i_cut.png i_delete.png i_paste.png index.docbook i_new_item.png ; do \
+- @for base in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
++ @for base in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
done
uninstall-nls:
-- for base in i_new_submenu.png i_k_button.png i_new_item.png index.docbook i_copy.png i_cut.png icon_sets.png i_paste.png i_delete.png ; do \
-+ for base in i_new_submenu.png i_k_button.png icon_sets.png i_copy.png i_cut.png i_delete.png i_paste.png index.docbook i_new_item.png ; do \
+- for base in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
++ for base in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
done
#>+ 5
distdir-nls:
-- for file in i_new_submenu.png i_k_button.png i_new_item.png index.docbook i_copy.png i_cut.png icon_sets.png i_paste.png i_delete.png ; do \
-+ for file in i_new_submenu.png i_k_button.png icon_sets.png i_copy.png i_cut.png i_delete.png i_paste.png index.docbook i_new_item.png ; do \
+- for file in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
++ for file in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/knetattach/Makefile.in
+++ doc/knetattach/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12241,7 +16557,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12250,7 +16566,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12262,9 +16578,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+--- doc/kompmgr/Makefile.in
++++ doc/kompmgr/Makefile.in
+@@ -250,6 +250,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -541,7 +544,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -579,9 +582,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- doc/konqueror/Makefile.in
+++ doc/konqueror/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12274,7 +16623,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -542,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12283,7 +16632,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12295,7 +16644,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -711,10 +714,10 @@
+@@ -727,10 +730,10 @@
.NOEXPORT:
#>+ 2
@@ -12308,7 +16657,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -741,20 +744,20 @@
+@@ -757,20 +760,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror
@@ -12334,7 +16683,7 @@
--- doc/konsole/Makefile.in
+++ doc/konsole/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12344,7 +16693,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12353,7 +16702,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12365,7 +16714,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -713,7 +716,7 @@
+@@ -729,7 +732,7 @@
KDE_DIST=index.docbook Makefile.in tabbar.png konsole.png Makefile.am index.cache.bz2
#>+ 24
@@ -12374,7 +16723,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -756,20 +759,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole
@@ -12400,7 +16749,7 @@
--- doc/kpager/Makefile.in
+++ doc/kpager/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12410,7 +16759,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12419,7 +16768,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12433,7 +16782,7 @@
mostlyclean-libtool:
--- doc/ksplashml/Makefile.in
+++ doc/ksplashml/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12443,7 +16792,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12452,7 +16801,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12466,7 +16815,7 @@
mostlyclean-libtool:
--- doc/ksysguard/Makefile.in
+++ doc/ksysguard/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12476,7 +16825,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12485,7 +16834,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12499,7 +16848,7 @@
mostlyclean-libtool:
--- doc/kwrite/Makefile.in
+++ doc/kwrite/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12509,7 +16858,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12518,7 +16867,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12532,7 +16881,7 @@
mostlyclean-libtool:
--- doc/kxkb/Makefile.in
+++ doc/kxkb/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12542,7 +16891,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12551,7 +16900,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12565,7 +16914,7 @@
mostlyclean-libtool:
--- doc/Makefile.in
+++ doc/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12575,12 +16924,12 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,13 +541,13 @@
+@@ -554,13 +557,13 @@
KDE_DOCS = AUTO
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
--SUBDIRS =. kdeprint kdebugdialog kappfinder kate kmenuedit konqueror knetattach quickstart kfind kcontrol userguide ksplashml kxkb kdcop glossary khelpcenter kwrite klipper kinfocenter faq visualdict kicker kpager konsole kdm kdesu ksysguard kioslave
-+SUBDIRS =. faq kdm kate kxkb ksysguard quickstart kdcop kdesu kfind klipper kappfinder konsole khelpcenter kmenuedit kioslave knetattach glossary kcontrol kdeprint kicker kpager kwrite ksplashml kdebugdialog kinfocenter userguide konqueror visualdict
+-SUBDIRS =. kdeprint kdebugdialog kappfinder kate kmenuedit konqueror knetattach quickstart kfind kcontrol userguide ksplashml kxkb kdcop glossary khelpcenter kwrite klipper kinfocenter faq visualdict kicker kpager konsole kdm kdesu kompmgr ksysguard kioslave
++SUBDIRS =. faq kdm kate kxkb ksysguard quickstart kdcop kdesu kfind klipper kappfinder kompmgr konsole khelpcenter kmenuedit kioslave knetattach glossary kcontrol kdeprint kicker kpager kwrite ksplashml kdebugdialog kinfocenter userguide konqueror visualdict
#>- all: all-recursive
#>+ 1
all: docs-am all-recursive
@@ -12591,7 +16940,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -598,9 +601,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12605,7 +16954,7 @@
mostlyclean-libtool:
--- doc/quickstart/Makefile.in
+++ doc/quickstart/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12615,7 +16964,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12624,7 +16973,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12638,7 +16987,7 @@
mostlyclean-libtool:
--- doc/userguide/Makefile.in
+++ doc/userguide/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12648,7 +16997,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12657,7 +17006,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12669,46 +17018,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -710,10 +713,10 @@
+@@ -726,10 +729,10 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook accessibility.docbook your-kde-account.docbook knode-mail-account.png programs-controlling.docbook kcontrol.png kaboodle-icon.png a-window.png pdf-files.docbook juk-icon.png amarok-icon.png kde-edutainment.docbook index.docbook the-filemanager.docbook open-file-dialog.png services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png oggfolder.png removable-disks.docbook getting-help.docbook noatun.png kmouth2.png font-installation.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png playing-movies.docbook file-sharing.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png kde-for-admins.docbook usenet.docbook kmouth.png juk.png net-connection-setup.docbook kmag.png groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook
-+KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png kaboodle-icon.png pdf-files.docbook a-window.png amarok-icon.png juk-icon.png kde-edutainment.docbook index.docbook the-filemanager.docbook open-file-dialog.png services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook amarok.png where-next.docbook removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png font-installation.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png net-connection-setup.docbook kmag.png groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook kppp-dialer-tab.png printer-setup.docbook under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook
+-KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook knode-mail-account.png programs-controlling.docbook kcontrol.png kaboodle-icon.png a-window.png pdf-files.docbook juk-icon.png amarok-icon.png kde-edutainment.docbook index.docbook the-filemanager.docbook open-file-dialog.png services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png oggfolder.png removable-disks.docbook getting-help.docbook noatun.png kmouth2.png font-installation.docbook extragear-applications.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png playing-movies.docbook file-sharing.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png kde-for-admins.docbook usenet.docbook kmouth.png juk.png net-connection-setup.docbook kmag.png groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook migrator-applications.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook
++KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png kaboodle-icon.png pdf-files.docbook a-window.png amarok-icon.png juk-icon.png kde-edutainment.docbook index.docbook the-filemanager.docbook open-file-dialog.png services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook amarok.png where-next.docbook removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png extragear-applications.docbook font-installation.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook kppp-dialer-tab.png printer-setup.docbook under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook migrator-applications.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png standard-menu-entries.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook file-sharing.docbook pdf-files.docbook kde-edutainment.docbook titlebar-menu.png printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook juk.png rip.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png kaboodle.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook kmouth2.png knode-identity.png kmouth3.png kcontrol.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -756,20 +759,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-- @for base in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png standard-menu-entries.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook file-sharing.docbook pdf-files.docbook kde-edutainment.docbook titlebar-menu.png printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook juk.png rip.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png kaboodle.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook kmouth2.png knode-identity.png kmouth3.png kcontrol.png ; do \
-+ @for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
+- @for base in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
++ @for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
done
uninstall-nls:
-- for base in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png standard-menu-entries.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook file-sharing.docbook pdf-files.docbook kde-edutainment.docbook titlebar-menu.png printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook juk.png rip.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png kaboodle.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook kmouth2.png knode-identity.png kmouth3.png kcontrol.png ; do \
-+ for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
+- for base in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
++ for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
done
#>+ 5
distdir-nls:
-- for file in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png standard-menu-entries.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook file-sharing.docbook pdf-files.docbook kde-edutainment.docbook titlebar-menu.png printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook juk.png rip.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png kaboodle.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook kmouth2.png knode-identity.png kmouth3.png kcontrol.png ; do \
-+ for file in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
+- for file in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
++ for file in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/visualdict/Makefile.in
+++ doc/visualdict/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12718,7 +17067,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12727,7 +17076,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12739,46 +17088,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -710,10 +713,10 @@
+@@ -726,10 +729,10 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict3.png pict13.png Makefile.am
-+KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict13.png pict3.png Makefile.am
+-KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict3.png pict13.png contextmenu.png Makefile.am
++KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict13.png pict3.png contextmenu.png Makefile.am
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) pict20.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -740,20 +743,20 @@
+@@ -756,20 +759,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict
-- @for base in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+ @for base in pict20.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
+- @for base in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
++ @for base in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
done
uninstall-nls:
-- for base in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+ for base in pict20.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
+- for base in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
++ for base in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
done
#>+ 5
distdir-nls:
-- for file in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+ for file in pict20.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
+- for file in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
++ for file in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- drkonqi/debuggers/Makefile.in
+++ drkonqi/debuggers/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12788,7 +17137,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12797,7 +17146,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12811,7 +17160,7 @@
mostlyclean-libtool:
--- drkonqi/Makefile.in
+++ drkonqi/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -314,6 +314,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12821,7 +17170,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -620,7 +623,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12830,7 +17179,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -658,9 +661,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12844,7 +17193,7 @@
@$(NORMAL_INSTALL)
--- drkonqi/pics/Makefile.in
+++ drkonqi/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12854,7 +17203,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12863,7 +17212,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12877,7 +17226,7 @@
mostlyclean-libtool:
--- drkonqi/presets/Makefile.in
+++ drkonqi/presets/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12887,7 +17236,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12896,7 +17245,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12910,7 +17259,7 @@
mostlyclean-libtool:
--- kappfinder/apps/Development/Makefile.in
+++ kappfinder/apps/Development/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12920,7 +17269,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -554,7 +557,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12929,7 +17278,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -592,9 +595,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12941,9 +17290,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kappfinder/apps/Editors/Makefile.in
-+++ kappfinder/apps/Editors/Makefile.in
-@@ -246,6 +246,9 @@
+--- kappfinder/apps/Games/Arcade/Makefile.in
++++ kappfinder/apps/Games/Arcade/Makefile.in
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12953,7 +17302,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12962,7 +17311,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12974,9 +17323,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kappfinder/apps/Games/Arcade/Makefile.in
-+++ kappfinder/apps/Games/Arcade/Makefile.in
-@@ -246,6 +246,9 @@
+--- kappfinder/apps/Games/Board/Makefile.in
++++ kappfinder/apps/Games/Board/Makefile.in
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12986,7 +17335,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12995,7 +17344,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13007,9 +17356,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kappfinder/apps/Games/Board/Makefile.in
-+++ kappfinder/apps/Games/Board/Makefile.in
-@@ -246,6 +246,9 @@
+--- kappfinder/apps/Games/Card/Makefile.in
++++ kappfinder/apps/Games/Card/Makefile.in
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13019,7 +17368,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13028,7 +17377,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13040,9 +17389,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kappfinder/apps/Games/Card/Makefile.in
-+++ kappfinder/apps/Games/Card/Makefile.in
-@@ -246,6 +246,9 @@
+--- kappfinder/apps/Games/Emulators/Makefile.in
++++ kappfinder/apps/Games/Emulators/Makefile.in
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13052,7 +17401,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13061,7 +17410,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13073,9 +17422,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kappfinder/apps/Games/Emulators/Makefile.in
-+++ kappfinder/apps/Games/Emulators/Makefile.in
-@@ -246,6 +246,9 @@
+--- kappfinder/apps/Games/Makefile.in
++++ kappfinder/apps/Games/Makefile.in
+@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13085,8 +17434,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
- all: docs-am all-am
+@@ -571,7 +574,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -13094,7 +17443,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13106,9 +17455,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kappfinder/apps/Games/Makefile.in
-+++ kappfinder/apps/Games/Makefile.in
-@@ -262,6 +262,9 @@
+--- kappfinder/apps/Games/Roguelikes/Makefile.in
++++ kappfinder/apps/Games/Roguelikes/Makefile.in
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13118,8 +17467,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
- all: docs-am all-recursive
+@@ -554,7 +557,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -13127,7 +17476,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -592,9 +595,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13139,9 +17488,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kappfinder/apps/Games/Roguelikes/Makefile.in
-+++ kappfinder/apps/Games/Roguelikes/Makefile.in
-@@ -246,6 +246,9 @@
+--- kappfinder/apps/Games/TacticStrategy/Makefile.in
++++ kappfinder/apps/Games/TacticStrategy/Makefile.in
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13151,7 +17500,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13160,7 +17509,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13172,9 +17521,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kappfinder/apps/Games/TacticStrategy/Makefile.in
-+++ kappfinder/apps/Games/TacticStrategy/Makefile.in
-@@ -246,6 +246,9 @@
+--- kappfinder/apps/Games/Toys/Makefile.in
++++ kappfinder/apps/Games/Toys/Makefile.in
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13184,7 +17533,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13193,7 +17542,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13207,7 +17556,7 @@
mostlyclean-libtool:
--- kappfinder/apps/Graphics/Makefile.in
+++ kappfinder/apps/Graphics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13217,7 +17566,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -558,7 +561,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13226,7 +17575,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -596,9 +599,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13240,7 +17589,7 @@
mostlyclean-libtool:
--- kappfinder/apps/Internet/Makefile.in
+++ kappfinder/apps/Internet/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13250,7 +17599,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -581,7 +584,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13259,7 +17608,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13271,18 +17620,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -913,7 +916,7 @@
+@@ -930,7 +933,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop Gabber.desktop mozilla.desktop ickle.desktop gnometalk.desktop netscape6.desktop gtelnet.desktop xftp.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop mozilla-firebird.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop Makefile.in btdownloadgui.desktop GnomeICU.desktop BlueFish.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop
-+KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop Gabber.desktop mozilla.desktop gnometalk.desktop ickle.desktop netscape6.desktop xftp.desktop gtelnet.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop mozilla-firebird.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop btdownloadgui.desktop Makefile.in BlueFish.desktop GnomeICU.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop
+-KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop javaws.desktop Gabber.desktop mozilla.desktop ickle.desktop gnometalk.desktop netscape6.desktop gtelnet.desktop xftp.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop Makefile.in btdownloadgui.desktop GnomeICU.desktop BlueFish.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop
++KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop javaws.desktop Gabber.desktop mozilla.desktop gnometalk.desktop ickle.desktop netscape6.desktop xftp.desktop gtelnet.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop btdownloadgui.desktop Makefile.in BlueFish.desktop GnomeICU.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop
#>+ 2
docs-am:
--- kappfinder/apps/Internet/Terminal/Makefile.in
+++ kappfinder/apps/Internet/Terminal/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13292,7 +17641,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13301,7 +17650,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13315,7 +17664,7 @@
mostlyclean-libtool:
--- kappfinder/apps/Makefile.in
+++ kappfinder/apps/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13325,7 +17674,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -558,7 +561,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13334,7 +17683,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -596,9 +599,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13348,7 +17697,7 @@
mostlyclean-libtool:
--- kappfinder/apps/Multimedia/Makefile.in
+++ kappfinder/apps/Multimedia/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13358,7 +17707,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -578,7 +581,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13367,7 +17716,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -616,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13379,7 +17728,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -764,7 +767,7 @@
+@@ -780,7 +783,7 @@
.NOEXPORT:
#>+ 2
@@ -13390,7 +17739,7 @@
docs-am:
--- kappfinder/apps/Office/Makefile.in
+++ kappfinder/apps/Office/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13400,7 +17749,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -559,7 +562,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13409,7 +17758,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -597,9 +600,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13421,7 +17770,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -743,7 +746,7 @@
+@@ -759,7 +762,7 @@
.NOEXPORT:
#>+ 2
@@ -13432,7 +17781,7 @@
docs-am:
--- kappfinder/apps/System/Makefile.in
+++ kappfinder/apps/System/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13442,7 +17791,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -571,7 +574,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13451,7 +17800,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13465,7 +17814,7 @@
mostlyclean-libtool:
--- kappfinder/apps/System/Terminal/Makefile.in
+++ kappfinder/apps/System/Terminal/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13475,7 +17824,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13484,7 +17833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13496,9 +17845,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kappfinder/apps/Toys/Makefile.in
-+++ kappfinder/apps/Toys/Makefile.in
-@@ -246,6 +246,9 @@
+--- kappfinder/apps/Utilities/Editors/Makefile.in
++++ kappfinder/apps/Utilities/Editors/Makefile.in
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13508,7 +17857,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13517,7 +17866,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13531,7 +17880,7 @@
mostlyclean-libtool:
--- kappfinder/apps/Utilities/Makefile.in
+++ kappfinder/apps/Utilities/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13541,7 +17890,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -571,7 +574,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13550,7 +17899,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13564,7 +17913,7 @@
mostlyclean-libtool:
--- kappfinder/apps/Utilities/xutils/Makefile.in
+++ kappfinder/apps/Utilities/xutils/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13574,7 +17923,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13583,7 +17932,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13597,7 +17946,7 @@
mostlyclean-libtool:
--- kappfinder/Makefile.in
+++ kappfinder/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -323,6 +323,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13607,7 +17956,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -624,7 +627,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13616,7 +17965,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -662,9 +665,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13628,39 +17977,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1076,23 +1079,23 @@
+@@ -1092,26 +1095,26 @@
- #>+ 19
+ #>+ 22
install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kappfinder.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kappfinder.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kappfinder.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kappfinder.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kappfinder.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kappfinder.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kappfinder.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kappfinder.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kappfinder.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kappfinder.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kappfinder.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kappfinder.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kappfinder.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kappfinder.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kappfinder.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kappfinder.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
#>+ 15
force-reedit:
--- kate/app/Makefile.in
+++ kate/app/Makefile.in
-@@ -333,6 +333,9 @@
+@@ -347,6 +347,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13670,7 +18025,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -663,7 +666,7 @@
+@@ -677,7 +680,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13679,7 +18034,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -701,9 +704,9 @@
+@@ -715,9 +718,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13691,52 +18046,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1134,18 +1137,18 @@
- mocs: katedocmanager.moc
-
- #>+ 3
--kateprojecttreeview.moc: $(srcdir)/kateprojecttreeview.h
-- $(MOC) $(srcdir)/kateprojecttreeview.h -o kateprojecttreeview.moc
-+kategrepdialog.moc: $(srcdir)/kategrepdialog.h
-+ $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
-
- #>+ 2
--mocs: kateprojecttreeview.moc
-+mocs: kategrepdialog.moc
-
- #>+ 3
--kategrepdialog.moc: $(srcdir)/kategrepdialog.h
-- $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
-+kateprojecttreeview.moc: $(srcdir)/kateprojecttreeview.h
-+ $(MOC) $(srcdir)/kateprojecttreeview.h -o kateprojecttreeview.moc
-
- #>+ 2
--mocs: kategrepdialog.moc
-+mocs: kateprojecttreeview.moc
-
- #>+ 3
- kateprojectlist.moc: $(srcdir)/kateprojectlist.h
-@@ -1298,7 +1301,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f katesavemodifieddialog.moc kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kateprojecttreeview.moc kategrepdialog.moc kateprojectlist.moc kwritemain.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateprojectviews.moc katepluginmanager.moc kateexternaltools.moc katemailfilesdialog.moc kateviewspacecontainer.moc kateprojectmanager.moc katefilelist.moc kateapp.moc kateviewmanager.moc katesplitter.moc kateconfigplugindialogpage.moc kateprojectdirview.moc
-+ -rm -f katesavemodifieddialog.moc kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc kateprojecttreeview.moc kateprojectlist.moc kwritemain.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateprojectviews.moc katepluginmanager.moc kateexternaltools.moc katemailfilesdialog.moc kateviewspacecontainer.moc kateprojectmanager.moc katefilelist.moc kateapp.moc kateviewmanager.moc katesplitter.moc kateconfigplugindialogpage.moc kateprojectdirview.moc
-
- #>+ 2
- KDE_DIST=kateprojecttreeview.h katepluginmanager.h katefileselector.h kateviewspace.h katemainwindowiface.h kateexternaltools.h katedocmanageriface.h kateconfigdialog.h kateviewspacecontainer.h kwritemain.h kateprojectviews.h katefilelist.h kateconsole.h katemailfilesdialog.h kateapp.h kateprojectdirview.h katedocmanager.h katemain.h kateconfigplugindialogpage.h katesplitter.h kateappIface.h Makefile.in katemainwindow.h kbookmarkhandler.h kateviewmanager.h kateprojectmanager.h katemwmodonhddialog.h Makefile.am katesavemodifieddialog.h kateprojectlist.h kategrepdialog.h
-@@ -1356,7 +1359,7 @@
-
-
- #>+ 11
--libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/kateprojectmanager.cpp $(srcdir)/katemainwindowiface.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kateprojectlist.cpp $(srcdir)/kateprojecttreeview.cpp $(srcdir)/kateprojectviews.cpp $(srcdir)/kateprojectdirview.cpp $(srcdir)/kateappIface.cpp $(srcdir)/katedocmanageriface.cpp $(srcdir)/kateexternaltools.cpp $(srcdir)/katesavemodifieddialog.cpp $(srcdir)/kateviewspacecontainer.cpp $(srcdir)/katemwmodonhddialog.cpp katemainwindowiface_skel.cpp katedocmanageriface_skel.cpp kateappIface_skel.cpp katesavemodifieddialog.moc kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kateprojectlist.moc kategrepdialog.moc kateprojecttreeview.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateprojectviews.moc kateexternaltools.moc katepluginmanager.moc katemailfilesdialog.moc kateviewspacecontainer.moc kateprojectmanager.moc katefilelist.moc kateapp.moc katesplitter.moc kateviewmanager.moc kateconfigplugindialogpage.moc kateprojectdirview.moc
-+libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/kateprojectmanager.cpp $(srcdir)/katemainwindowiface.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kateprojectlist.cpp $(srcdir)/kateprojecttreeview.cpp $(srcdir)/kateprojectviews.cpp $(srcdir)/kateprojectdirview.cpp $(srcdir)/kateappIface.cpp $(srcdir)/katedocmanageriface.cpp $(srcdir)/kateexternaltools.cpp $(srcdir)/katesavemodifieddialog.cpp $(srcdir)/kateviewspacecontainer.cpp $(srcdir)/katemwmodonhddialog.cpp katemainwindowiface_skel.cpp katedocmanageriface_skel.cpp kateappIface_skel.cpp katesavemodifieddialog.moc kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kateprojectlist.moc kateprojecttreeview.moc kategrepdialog.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateprojectviews.moc kateexternaltools.moc katepluginmanager.moc katemailfilesdialog.moc kateviewspacecontainer.moc kateprojectmanager.moc katefilelist.moc kateapp.moc katesplitter.moc kateviewmanager.moc kateconfigplugindialogpage.moc kateprojectdirview.moc
- @echo 'creating libkateinterfaces_la.all_cpp.cpp ...'; \
- rm -f libkateinterfaces_la.all_cpp.files libkateinterfaces_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkateinterfaces_la.all_cpp.final; \
--- kate/data/Makefile.in
+++ kate/data/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -271,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13746,7 +18058,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -572,7 +575,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13755,7 +18067,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -610,9 +613,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13765,11 +18077,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-katescriptsSCRIPTS: $(katescripts_SCRIPTS)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- kate/interfaces/Makefile.in
+++ kate/interfaces/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13779,7 +18091,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13788,7 +18100,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13800,52 +18112,122 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -896,18 +899,18 @@
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub projectiface.kidl
+@@ -899,6 +902,13 @@
+ .NOEXPORT:
#>+ 3
--documentmanager.moc: $(srcdir)/documentmanager.h
-- $(MOC) $(srcdir)/documentmanager.h -o documentmanager.moc
+plugin.moc: $(srcdir)/plugin.h
+ $(MOC) $(srcdir)/plugin.h -o plugin.moc
-
- #>+ 2
--mocs: documentmanager.moc
++
++#>+ 2
+mocs: plugin.moc
++
++#>+ 3
+ documentmanager.moc: $(srcdir)/documentmanager.h
+ $(MOC) $(srcdir)/documentmanager.h -o documentmanager.moc
+@@ -906,39 +916,39 @@
+ mocs: documentmanager.moc
+
#>+ 3
-plugin.moc: $(srcdir)/plugin.h
- $(MOC) $(srcdir)/plugin.h -o plugin.moc
-+documentmanager.moc: $(srcdir)/documentmanager.h
-+ $(MOC) $(srcdir)/documentmanager.h -o documentmanager.moc
++pluginconfiginterfaceextension.moc: $(srcdir)/pluginconfiginterfaceextension.h
++ $(MOC) $(srcdir)/pluginconfiginterfaceextension.h -o pluginconfiginterfaceextension.moc
#>+ 2
-mocs: plugin.moc
-+mocs: documentmanager.moc
++mocs: pluginconfiginterfaceextension.moc
#>+ 3
- project.moc: $(srcdir)/project.h
-@@ -967,7 +970,7 @@
+-toolviewmanager.moc: $(srcdir)/toolviewmanager.h
+- $(MOC) $(srcdir)/toolviewmanager.h -o toolviewmanager.moc
++application.moc: $(srcdir)/application.h
++ $(MOC) $(srcdir)/application.h -o application.moc
+ #>+ 2
+-mocs: toolviewmanager.moc
++mocs: application.moc
+
#>+ 3
+-mainwindow.moc: $(srcdir)/mainwindow.h
+- $(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
++pluginmanager.moc: $(srcdir)/pluginmanager.h
++ $(MOC) $(srcdir)/pluginmanager.h -o pluginmanager.moc
+
+ #>+ 2
+-mocs: mainwindow.moc
++mocs: pluginmanager.moc
+
+ #>+ 3
+-pluginconfiginterfaceextension.moc: $(srcdir)/pluginconfiginterfaceextension.h
+- $(MOC) $(srcdir)/pluginconfiginterfaceextension.h -o pluginconfiginterfaceextension.moc
++mainwindow.moc: $(srcdir)/mainwindow.h
++ $(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
+
+ #>+ 2
+-mocs: pluginconfiginterfaceextension.moc
++mocs: mainwindow.moc
+
+ #>+ 3
+-application.moc: $(srcdir)/application.h
+- $(MOC) $(srcdir)/application.h -o application.moc
++toolviewmanager.moc: $(srcdir)/toolviewmanager.h
++ $(MOC) $(srcdir)/toolviewmanager.h -o toolviewmanager.moc
+
+ #>+ 2
+-mocs: application.moc
++mocs: toolviewmanager.moc
+
+ #>+ 3
+ viewmanager.moc: $(srcdir)/viewmanager.h
+@@ -948,15 +958,8 @@
+ mocs: viewmanager.moc
+
+ #>+ 3
+-pluginmanager.moc: $(srcdir)/pluginmanager.h
+- $(MOC) $(srcdir)/pluginmanager.h -o pluginmanager.moc
+-
+-#>+ 2
+-mocs: pluginmanager.moc
+-
+-#>+ 3
clean-metasources:
-- -rm -f documentmanager.moc plugin.moc project.moc pluginconfiginterfaceextension.moc application.moc pluginmanager.moc projectmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
-+ -rm -f plugin.moc documentmanager.moc project.moc pluginconfiginterfaceextension.moc application.moc pluginmanager.moc projectmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
+- -rm -f documentmanager.moc plugin.moc toolviewmanager.moc mainwindow.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
++ -rm -f plugin.moc documentmanager.moc pluginconfiginterfaceextension.moc application.moc pluginmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
#>+ 2
- KDE_DIST=projectiface.h Makefile.in Makefile.am
-@@ -1019,7 +1022,7 @@
+ KDE_DIST=Makefile.in Makefile.am
+@@ -1003,7 +1006,7 @@
#>+ 11
--libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp $(srcdir)/project.cpp $(srcdir)/projectmanager.cpp projectiface_skel.cpp plugin.moc documentmanager.moc pluginconfiginterfaceextension.moc project.moc application.moc pluginmanager.moc projectmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
-+libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp $(srcdir)/project.cpp $(srcdir)/projectmanager.cpp projectiface_skel.cpp documentmanager.moc plugin.moc pluginconfiginterfaceextension.moc project.moc application.moc pluginmanager.moc projectmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
+-libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp plugin.moc documentmanager.moc mainwindow.moc toolviewmanager.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
++libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp documentmanager.moc plugin.moc toolviewmanager.moc mainwindow.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
@echo 'creating libkateinterfacesprivate_la.all_cpp.cpp ...'; \
rm -f libkateinterfacesprivate_la.all_cpp.files libkateinterfacesprivate_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkateinterfacesprivate_la.all_cpp.final; \
+@@ -1041,15 +1044,15 @@
+ #>+ 19
+ documentmanager.o: documentmanager.moc
+ toolviewmanager.o: toolviewmanager.moc
+-pluginmanager.lo: pluginmanager.moc
+ mainwindow.lo: mainwindow.moc
++pluginmanager.lo: pluginmanager.moc
+ documentmanager.lo: documentmanager.moc
+ pluginmanager.o: pluginmanager.moc
+ viewmanager.lo: viewmanager.moc
+ toolviewmanager.lo: toolviewmanager.moc
+ viewmanager.o: viewmanager.moc
+-pluginconfiginterfaceextension.lo: pluginconfiginterfaceextension.moc
+ pluginconfiginterfaceextension.o: pluginconfiginterfaceextension.moc
++pluginconfiginterfaceextension.lo: pluginconfiginterfaceextension.moc
+ nmcheck:
+ plugin.lo: plugin.moc
+ plugin.o: plugin.moc
--- kate/Makefile.in
+++ kate/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -268,6 +268,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13855,7 +18237,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -559,7 +562,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13864,7 +18246,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -597,9 +600,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13878,7 +18260,7 @@
mostlyclean-libtool:
--- kate/pics/actions/Makefile.in
+++ kate/pics/actions/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13888,7 +18270,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13897,7 +18279,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13909,7 +18291,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -708,51 +711,51 @@
+@@ -724,51 +727,51 @@
.NOEXPORT:
#>+ 2
@@ -13989,7 +18371,7 @@
force-reedit:
--- kate/pics/Makefile.in
+++ kate/pics/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13999,7 +18381,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -569,7 +572,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14008,7 +18390,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -607,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14020,128 +18402,78 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -879,38 +882,38 @@
+@@ -928,43 +931,43 @@
- #>+ 34
+ #>+ 39
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwrite2.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwrite.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwrite.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwrite2.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kate.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kate.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwrite.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwrite.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kate.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwrite.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kate.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kate2.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwrite.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kate.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kate.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwrite.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
+- $(INSTALL_DATA) $(srcdir)/hisc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwrite.png
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kate.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwrite2.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwrite.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwrite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kate.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kate.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwrite2.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwrite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwrite.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kate.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwrite.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kate.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kate2.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwrite.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kate.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kate.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwrite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwrite.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kate.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
#>+ 15
force-reedit:
---- kate/plugins/defaultproject/Makefile.in
-+++ kate/plugins/defaultproject/Makefile.in
-@@ -281,6 +281,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -621,9 +624,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- kate/plugins/Makefile.in
-+++ kate/plugins/Makefile.in
-@@ -252,6 +252,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
- all: docs-am all-recursive
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -578,9 +581,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- kate/utils/Makefile.in
+++ kate/utils/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14151,7 +18483,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14160,7 +18492,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14174,7 +18506,7 @@
@$(NORMAL_INSTALL)
--- kcheckpass/Makefile.in
+++ kcheckpass/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14184,7 +18516,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
+@@ -586,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -14193,7 +18525,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -608,9 +611,9 @@
+@@ -624,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14207,7 +18539,7 @@
@$(NORMAL_INSTALL)
--- kcminit/Makefile.in
+++ kcminit/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -325,6 +325,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14217,7 +18549,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -626,7 +629,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14226,7 +18558,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -664,9 +667,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14240,7 +18572,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/access/Makefile.in
+++ kcontrol/access/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -323,6 +323,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14250,7 +18582,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -636,7 +639,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14259,7 +18591,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -674,9 +677,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14273,7 +18605,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/accessibility/Makefile.in
+++ kcontrol/accessibility/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14283,7 +18615,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14292,7 +18624,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14306,7 +18638,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/arts/Makefile.in
+++ kcontrol/arts/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14316,7 +18648,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14325,7 +18657,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14339,7 +18671,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/background/Makefile.in
+++ kcontrol/background/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -331,6 +331,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14349,7 +18681,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -627,7 +630,7 @@
+@@ -643,7 +646,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14358,7 +18690,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -665,9 +668,9 @@
+@@ -681,9 +684,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14370,7 +18702,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1084,18 +1087,18 @@
+@@ -1100,18 +1103,18 @@
#>+ 3
@@ -14395,7 +18727,7 @@
#>+ 3
bgadvanced.moc: $(srcdir)/bgadvanced.h
-@@ -1127,7 +1130,7 @@
+@@ -1143,7 +1146,7 @@
#>+ 3
clean-metasources:
@@ -14403,8 +18735,8 @@
+ -rm -f bgwallpaper.moc bgrender.moc bgadvanced.moc bgmonitor.moc bgdialog.moc main.moc
#>+ 2
- KDE_DIST=background.desktop bgwallpaper_ui.ui bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am
-@@ -1250,8 +1253,8 @@
+ KDE_DIST=background.desktop bgwallpaper_ui.ui bghash.h bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am
+@@ -1262,8 +1265,8 @@
$(srcdir)/bgmonitor.cpp: bgdialog_ui.h bgwallpaper_ui.h bgadvanced_ui.h
bgdialog.lo: bgdialog.moc
nmcheck:
@@ -14416,7 +18748,7 @@
--- kcontrol/background/pics/Makefile.in
+++ kcontrol/background/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14426,7 +18758,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14435,7 +18767,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14449,7 +18781,7 @@
mostlyclean-libtool:
--- kcontrol/bell/Makefile.in
+++ kcontrol/bell/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14459,7 +18791,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14468,7 +18800,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14482,7 +18814,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/clock/Makefile.in
+++ kcontrol/clock/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14492,7 +18824,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -595,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14501,7 +18833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -633,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14513,7 +18845,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -910,18 +913,18 @@
+@@ -926,18 +929,18 @@
#>+ 3
@@ -14538,7 +18870,7 @@
#>+ 3
main.moc: $(srcdir)/main.h
-@@ -932,7 +935,7 @@
+@@ -948,7 +951,7 @@
#>+ 3
clean-metasources:
@@ -14547,7 +18879,7 @@
#>+ 2
KDE_DIST=clock.desktop dtime.h main.h Makefile.in tzone.h Makefile.am
-@@ -983,7 +986,7 @@
+@@ -999,7 +1002,7 @@
#>+ 11
@@ -14556,7 +18888,7 @@
@echo 'creating kcm_clock_la.all_cpp.cpp ...'; \
rm -f kcm_clock_la.all_cpp.files kcm_clock_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_clock_la.all_cpp.final; \
-@@ -1029,5 +1032,5 @@
+@@ -1041,5 +1044,5 @@
nmcheck-am: nmcheck
dtime.lo: dtime.moc
main.o: main.moc
@@ -14565,7 +18897,7 @@
+dtime.o: dtime.moc
--- kcontrol/colors/Makefile.in
+++ kcontrol/colors/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14575,7 +18907,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -600,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14584,7 +18916,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -638,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14598,7 +18930,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/componentchooser/componentservices/Makefile.in
+++ kcontrol/componentchooser/componentservices/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14608,7 +18940,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14617,7 +18949,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14631,7 +18963,7 @@
mostlyclean-libtool:
--- kcontrol/componentchooser/Makefile.in
+++ kcontrol/componentchooser/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -313,6 +313,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14641,7 +18973,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -615,7 +618,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14650,7 +18982,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -653,9 +656,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14662,7 +18994,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1051,7 +1054,7 @@
+@@ -1067,7 +1070,7 @@
-rm -f componentchooser.moc kcm_componentchooser.moc
#>+ 2
@@ -14673,7 +19005,7 @@
clean-ui:
--- kcontrol/crypto/Makefile.in
+++ kcontrol/crypto/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14683,7 +19015,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -600,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14692,7 +19024,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -638,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14704,7 +19036,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -916,18 +919,18 @@
+@@ -932,18 +935,18 @@
#>+ 3
@@ -14729,7 +19061,7 @@
#>+ 3
certexport.moc: $(srcdir)/certexport.h
-@@ -938,7 +941,7 @@
+@@ -954,7 +957,7 @@
#>+ 3
clean-metasources:
@@ -14738,7 +19070,7 @@
#>+ 2
KDE_DIST=certgen.ui crypto.desktop configure.in.in Makefile.in Makefile.am
-@@ -989,7 +992,7 @@
+@@ -1005,7 +1008,7 @@
#>+ 11
@@ -14749,7 +19081,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_crypto_la.all_cpp.final; \
--- kcontrol/css/Makefile.in
+++ kcontrol/css/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14759,7 +19091,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -600,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14768,7 +19100,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -638,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14782,7 +19114,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/display/Makefile.in
+++ kcontrol/display/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14792,7 +19124,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14801,7 +19133,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14815,7 +19147,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/dnssd/Makefile.in
+++ kcontrol/dnssd/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -305,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14825,7 +19157,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -606,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14834,7 +19166,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -644,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14848,7 +19180,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/ebrowsing/Makefile.in
+++ kcontrol/ebrowsing/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14858,7 +19190,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -610,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14867,7 +19199,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -648,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14881,7 +19213,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/ebrowsing/plugins/ikws/Makefile.in
+++ kcontrol/ebrowsing/plugins/ikws/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -331,6 +331,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14891,7 +19223,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -633,7 +636,7 @@
+@@ -649,7 +652,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14900,7 +19232,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -671,9 +674,9 @@
+@@ -687,9 +690,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14914,7 +19246,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14924,7 +19256,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -620,7 +623,7 @@
+@@ -641,7 +644,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14933,7 +19265,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -658,9 +661,9 @@
+@@ -679,9 +682,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14945,18 +19277,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -820,7 +823,7 @@
+@@ -841,7 +844,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=kde.desktop leo.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop whatis.desktop austronaut.desktop docbook.desktop deb.desktop google_lucky.desktop jeeves.desktop msdn.desktop doi.desktop alexa_url.desktop kde_webcvs.desktop bugno.desktop dmoz.desktop en2fr.desktop acronym.desktop google.desktop fsd.desktop nl-teletekst.desktop webster.desktop katatudo.desktop ctan_cat.desktop wordref.desktop call.desktop de2fr.desktop wikipedia.desktop cia.desktop alltheweb.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop php.desktop nl-telephone.desktop feedster.desktop foldoc.desktop en2de.desktop google_news.desktop dbug.desktop qt.desktop rfc.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop metacrawler.desktop excite.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop
-+KDE_DIST=leo.desktop kde.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop whatis.desktop austronaut.desktop docbook.desktop deb.desktop google_lucky.desktop jeeves.desktop msdn.desktop doi.desktop alexa_url.desktop kde_webcvs.desktop bugno.desktop dmoz.desktop google.desktop acronym.desktop en2fr.desktop fsd.desktop nl-teletekst.desktop katatudo.desktop webster.desktop ctan_cat.desktop wordref.desktop call.desktop de2fr.desktop wikipedia.desktop alltheweb.desktop cia.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop nl-telephone.desktop php.desktop foldoc.desktop feedster.desktop en2de.desktop dbug.desktop google_news.desktop qt.desktop rfc.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop excite.desktop metacrawler.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop
+-KDE_DIST=kde.desktop leo.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop whatis.desktop qt3.desktop austronaut.desktop docbook.desktop deb.desktop google_lucky.desktop jeeves.desktop technoratitags.desktop msdn.desktop doi.desktop alexa_url.desktop bugno.desktop dmoz.desktop en2fr.desktop acronym.desktop google.desktop fsd.desktop nl-teletekst.desktop webster.desktop katatudo.desktop ctan_cat.desktop wordref.desktop call.desktop google_movie.desktop de2fr.desktop wikipedia.desktop cia.desktop alltheweb.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop php.desktop nl-telephone.desktop feedster.desktop foldoc.desktop en2de.desktop google_news.desktop dbug.desktop wiktionary.desktop qt.desktop kde_websvn.desktop technorati.desktop rfc.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop metacrawler.desktop excite.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop
++KDE_DIST=leo.desktop kde.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop qt3.desktop whatis.desktop austronaut.desktop docbook.desktop deb.desktop google_lucky.desktop jeeves.desktop technoratitags.desktop msdn.desktop doi.desktop alexa_url.desktop bugno.desktop dmoz.desktop google.desktop acronym.desktop en2fr.desktop fsd.desktop nl-teletekst.desktop katatudo.desktop webster.desktop ctan_cat.desktop wordref.desktop call.desktop google_movie.desktop de2fr.desktop wikipedia.desktop alltheweb.desktop cia.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop nl-telephone.desktop php.desktop foldoc.desktop feedster.desktop en2de.desktop dbug.desktop wiktionary.desktop google_news.desktop qt.desktop kde_websvn.desktop rfc.desktop technorati.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop excite.desktop metacrawler.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop
#>+ 2
docs-am:
--- kcontrol/ebrowsing/plugins/localdomain/Makefile.in
+++ kcontrol/ebrowsing/plugins/localdomain/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -319,6 +319,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14966,7 +19298,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -622,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -14975,7 +19307,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -660,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14989,7 +19321,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/ebrowsing/plugins/Makefile.in
+++ kcontrol/ebrowsing/plugins/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14999,7 +19331,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -15008,7 +19340,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15022,7 +19354,7 @@
mostlyclean-libtool:
--- kcontrol/ebrowsing/plugins/shorturi/Makefile.in
+++ kcontrol/ebrowsing/plugins/shorturi/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15032,7 +19364,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15041,7 +19373,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15055,7 +19387,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/energy/Makefile.in
+++ kcontrol/energy/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -311,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15065,7 +19397,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -613,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15074,7 +19406,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -651,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15088,7 +19420,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/energy/pics/Makefile.in
+++ kcontrol/energy/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15098,7 +19430,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15107,7 +19439,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15121,7 +19453,7 @@
mostlyclean-libtool:
--- kcontrol/filetypes/Makefile.in
+++ kcontrol/filetypes/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -319,6 +319,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15131,7 +19463,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -630,7 +633,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15140,7 +19472,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -668,9 +671,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15154,7 +19486,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/fonts/Makefile.in
+++ kcontrol/fonts/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -303,6 +303,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15164,7 +19496,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -607,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15173,7 +19505,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -645,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15187,7 +19519,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/icons/Makefile.in
+++ kcontrol/icons/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -305,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15197,7 +19529,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -608,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15206,7 +19538,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -646,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15218,7 +19550,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -942,18 +945,18 @@
+@@ -958,18 +961,18 @@
#>+ 3
@@ -15243,7 +19575,7 @@
#>+ 3
main.moc: $(srcdir)/main.h
-@@ -964,7 +967,7 @@
+@@ -980,7 +983,7 @@
#>+ 3
clean-metasources:
@@ -15252,7 +19584,7 @@
#>+ 2
KDE_DIST=icons.desktop Makefile.in uninstall.desktop Makefile.am
-@@ -1015,7 +1018,7 @@
+@@ -1031,7 +1034,7 @@
#>+ 11
@@ -15263,7 +19595,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
--- kcontrol/info/Makefile.in
+++ kcontrol/info/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15273,7 +19605,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15282,7 +19614,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15294,7 +19626,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -929,7 +932,7 @@
+@@ -945,7 +948,7 @@
-rm -f memory.moc
#>+ 2
@@ -15305,7 +19637,7 @@
clean-closures:
--- kcontrol/input/core/Makefile.in
+++ kcontrol/input/core/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15315,7 +19647,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -578,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15324,7 +19656,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -616,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15338,7 +19670,7 @@
clean-noinstLTLIBRARIES:
--- kcontrol/input/Makefile.in
+++ kcontrol/input/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -328,6 +328,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15348,7 +19680,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -644,7 +647,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15357,7 +19689,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -682,9 +685,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15369,18 +19701,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1090,7 +1093,7 @@
+@@ -1176,7 +1179,7 @@
-rm -f logitechmouse.moc mouse.moc
#>+ 2
--KDE_DIST=consoleUserPerms mouse.desktop configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am
-+KDE_DIST=mouse.desktop consoleUserPerms configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am
+-KDE_DIST=consoleUserPerms mouse.desktop configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz mouse_cursor_theme.upd kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am
++KDE_DIST=mouse.desktop consoleUserPerms configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz mouse_cursor_theme.upd kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am
#>+ 5
clean-ui:
--- kcontrol/input/pics/Makefile.in
+++ kcontrol/input/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15390,7 +19722,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15399,7 +19731,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15413,7 +19745,7 @@
mostlyclean-libtool:
--- kcontrol/input/xcursor/Makefile.in
+++ kcontrol/input/xcursor/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15423,7 +19755,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -565,7 +568,7 @@
+@@ -581,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15432,7 +19764,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -603,9 +606,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15446,7 +19778,7 @@
clean-noinstLTLIBRARIES:
--- kcontrol/ioslaveinfo/Makefile.in
+++ kcontrol/ioslaveinfo/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15456,7 +19788,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15465,7 +19797,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15479,7 +19811,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/joystick/Makefile.in
+++ kcontrol/joystick/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15489,7 +19821,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15498,7 +19830,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15512,7 +19844,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/kcontrol/about/Makefile.in
+++ kcontrol/kcontrol/about/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15522,7 +19854,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15531,7 +19863,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15545,7 +19877,7 @@
mostlyclean-libtool:
--- kcontrol/kcontrol/Makefile.in
+++ kcontrol/kcontrol/Makefile.in
-@@ -335,6 +335,9 @@
+@@ -349,6 +349,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15555,7 +19887,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -653,7 +656,7 @@
+@@ -669,7 +672,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15564,7 +19896,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -691,9 +694,9 @@
+@@ -707,9 +710,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15576,7 +19908,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1239,6 +1242,13 @@
+@@ -1254,6 +1257,13 @@
mocs: indexwidget.moc
#>+ 3
@@ -15590,7 +19922,7 @@
dockcontainer.moc: $(srcdir)/dockcontainer.h
$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
-@@ -1253,13 +1263,6 @@
+@@ -1268,13 +1278,6 @@
mocs: aboutwidget.moc
#>+ 3
@@ -15604,20 +19936,20 @@
proxywidget.moc: $(srcdir)/proxywidget.h
$(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
-@@ -1331,10 +1334,10 @@
+@@ -1332,10 +1335,10 @@
#>+ 3
clean-metasources:
-- -rm -f indexwidget.moc dockcontainer.moc aboutwidget.moc moduleiconview.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.moc
-+ -rm -f indexwidget.moc moduleiconview.moc dockcontainer.moc aboutwidget.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.moc
+- -rm -f indexwidget.moc dockcontainer.moc aboutwidget.moc moduleiconview.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.moc
++ -rm -f indexwidget.moc moduleiconview.moc dockcontainer.moc aboutwidget.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.moc
#>+ 2
--KDE_DIST=cr48-app-kcontrol.png KControl_NoDisplay.desktop aboutwidget.h toplevel.h kcontrolui.rc helpwidget.h main.h searchwidget.h dockcontainer.h cr16-app-kcontrol.png KControl.desktop modules.h cr32-app-kcontrol.png proxywidget.h quickhelp.h cr64-app-kcontrol.png global.h modulemenu.cpp modulemenu.h kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h cr128-app-kcontrol.png indexwidget.h moduleIface.h Makefile.am kcrootonly.h
-+KDE_DIST=cr48-app-kcontrol.png KControl_NoDisplay.desktop aboutwidget.h toplevel.h kcontrolui.rc helpwidget.h main.h searchwidget.h dockcontainer.h cr16-app-kcontrol.png KControl.desktop modules.h cr32-app-kcontrol.png proxywidget.h quickhelp.h cr64-app-kcontrol.png global.h modulemenu.h modulemenu.cpp kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h cr128-app-kcontrol.png indexwidget.h moduleIface.h Makefile.am kcrootonly.h
+-KDE_DIST=cr48-app-kcontrol.png KControl_NoDisplay.desktop aboutwidget.h toplevel.h kcontrolui.rc helpwidget.h main.h searchwidget.h dockcontainer.h cr16-app-kcontrol.png KControl.desktop modules.h cr32-app-kcontrol.png proxywidget.h cr64-app-kcontrol.png global.h modulemenu.cpp modulemenu.h kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h cr128-app-kcontrol.png indexwidget.h moduleIface.h Makefile.am kcrootonly.h
++KDE_DIST=cr48-app-kcontrol.png KControl_NoDisplay.desktop aboutwidget.h toplevel.h kcontrolui.rc helpwidget.h main.h searchwidget.h dockcontainer.h cr16-app-kcontrol.png KControl.desktop modules.h cr32-app-kcontrol.png proxywidget.h cr64-app-kcontrol.png global.h modulemenu.h modulemenu.cpp kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h cr128-app-kcontrol.png indexwidget.h moduleIface.h Makefile.am kcrootonly.h
#>+ 4
clean-idl:
-@@ -1346,23 +1349,23 @@
+@@ -1347,23 +1350,23 @@
#>+ 19
install-kde-icons:
@@ -15650,18 +19982,18 @@
#>+ 15
force-reedit:
-@@ -1403,7 +1406,7 @@
+@@ -1404,7 +1407,7 @@
#>+ 11
--libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp indexwidget.moc moduleiconview.moc aboutwidget.moc dockcontainer.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.moc
-+libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp indexwidget.moc aboutwidget.moc dockcontainer.moc moduleiconview.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.moc
+-libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp indexwidget.moc moduleiconview.moc aboutwidget.moc dockcontainer.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.moc
++libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp indexwidget.moc aboutwidget.moc dockcontainer.moc moduleiconview.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.moc
@echo 'creating libkdeinit_kcontrol_la.all_cpp.cpp ...'; \
rm -f libkdeinit_kcontrol_la.all_cpp.files libkdeinit_kcontrol_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kcontrol_la.all_cpp.final; \
--- kcontrol/kded/Makefile.in
+++ kcontrol/kded/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15671,7 +20003,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15680,7 +20012,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15692,7 +20024,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -916,7 +919,7 @@
+@@ -932,7 +935,7 @@
-rm -f kcmkded.moc
#>+ 2
@@ -15703,7 +20035,7 @@
clean-closures:
--- kcontrol/kdm/Makefile.in
+++ kcontrol/kdm/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -304,6 +304,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15713,7 +20045,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -610,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15722,7 +20054,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -648,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15736,7 +20068,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/keys/Makefile.in
+++ kcontrol/keys/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -304,6 +304,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15746,7 +20078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -608,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15755,7 +20087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -646,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15767,7 +20099,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -999,18 +1002,18 @@
+@@ -1015,18 +1018,18 @@
mocs: treeview.moc
#>+ 3
@@ -15792,7 +20124,7 @@
#>+ 3
keyconfig.moc: $(srcdir)/keyconfig.h
-@@ -1028,7 +1031,7 @@
+@@ -1044,7 +1047,7 @@
#>+ 3
clean-metasources:
@@ -15801,7 +20133,7 @@
#>+ 2
KDE_DIST=keys.desktop commandShortcuts.h kaccelaction.h treeview.h win3.kksrc main.h kde4.kksrc shortcuts.h win4.kksrc mac4.kksrc khotkeys.h modifiers.h keyconfig.h keyconfig.cpp wm3.kksrc convertShortcuts.pl unix3.kksrc Makefile.in kde3.kksrc kaccel.upd Makefile.am
-@@ -1079,7 +1082,7 @@
+@@ -1095,7 +1098,7 @@
#>+ 11
@@ -15812,7 +20144,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_keys_la.all_cpp.final; \
--- kcontrol/kfontinst/kcmfontinst/Makefile.in
+++ kcontrol/kfontinst/kcmfontinst/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -305,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15822,7 +20154,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -622,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15831,7 +20163,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -660,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15843,7 +20175,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -958,16 +961,16 @@
+@@ -984,16 +987,16 @@
#>+ 13
install-kde-icons:
@@ -15865,7 +20197,7 @@
#>+ 15
--- kcontrol/kfontinst/kfile-plugin/Makefile.in
+++ kcontrol/kfontinst/kfile-plugin/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15875,7 +20207,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15884,7 +20216,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15898,7 +20230,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/kfontinst/Makefile.in
+++ kcontrol/kfontinst/kfontinst/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -305,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15908,7 +20240,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -614,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -15917,7 +20249,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -652,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15931,7 +20263,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/kio/Makefile.in
+++ kcontrol/kfontinst/kio/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15941,7 +20273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -611,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15950,7 +20282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -649,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15964,7 +20296,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/lib/Makefile.in
+++ kcontrol/kfontinst/lib/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15974,7 +20306,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -602,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15983,7 +20315,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -640,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15997,7 +20329,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/Makefile.in
+++ kcontrol/kfontinst/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16007,7 +20339,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -573,7 +576,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16016,7 +20348,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -611,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16030,7 +20362,7 @@
mostlyclean-libtool:
--- kcontrol/kfontinst/thumbnail/Makefile.in
+++ kcontrol/kfontinst/thumbnail/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16040,7 +20372,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16049,7 +20381,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16063,7 +20395,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/viewpart/Makefile.in
+++ kcontrol/kfontinst/viewpart/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -322,6 +322,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16073,7 +20405,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -630,7 +633,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16082,7 +20414,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -668,9 +671,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16094,9 +20426,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1002,11 +1005,11 @@
+@@ -1033,11 +1036,11 @@
+ .NOEXPORT:
-
#>+ 3
-FontViewPart.moc: $(srcdir)/FontViewPart.h
- $(MOC) $(srcdir)/FontViewPart.h -o FontViewPart.moc
@@ -16109,7 +20441,7 @@
#>+ 3
FontViewPartFactory.moc: $(srcdir)/FontViewPartFactory.h
-@@ -1016,11 +1019,11 @@
+@@ -1047,11 +1050,11 @@
mocs: FontViewPartFactory.moc
#>+ 3
@@ -16124,7 +20456,7 @@
#>+ 3
FontPreview.moc: $(srcdir)/FontPreview.h
-@@ -1031,7 +1034,7 @@
+@@ -1071,7 +1074,7 @@
#>+ 3
clean-metasources:
@@ -16133,7 +20465,7 @@
#>+ 2
KDE_DIST=kfontviewui.rc kfontviewpart.desktop kfontview.desktop Makefile.in Makefile.am kfontviewpart.rc
-@@ -1082,7 +1085,7 @@
+@@ -1122,7 +1125,7 @@
#>+ 11
@@ -16142,7 +20474,7 @@
@echo 'creating libkfontviewpart_la.all_cpp.cpp ...'; \
rm -f libkfontviewpart_la.all_cpp.files libkfontviewpart_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkfontviewpart_la.all_cpp.final; \
-@@ -1126,9 +1129,9 @@
+@@ -1162,9 +1165,9 @@
FontPreview.lo: FontPreview.moc
FontPreview.o: FontPreview.moc
nmcheck-am: nmcheck
@@ -16156,7 +20488,7 @@
FontViewerApp.o: FontViewerApp.moc
--- kcontrol/kicker/Makefile.in
+++ kcontrol/kicker/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -309,6 +309,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16166,7 +20498,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -630,7 +633,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16175,7 +20507,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -668,9 +671,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16187,47 +20519,71 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -976,18 +979,18 @@
+@@ -1007,11 +1010,11 @@
#>+ 3
--menutab_impl.moc: $(srcdir)/menutab_impl.h
-- $(MOC) $(srcdir)/menutab_impl.h -o menutab_impl.moc
+-lookandfeelconfig.moc: $(srcdir)/lookandfeelconfig.h
+- $(MOC) $(srcdir)/lookandfeelconfig.h -o lookandfeelconfig.moc
+applettab_impl.moc: $(srcdir)/applettab_impl.h
+ $(MOC) $(srcdir)/applettab_impl.h -o applettab_impl.moc
#>+ 2
--mocs: menutab_impl.moc
+-mocs: lookandfeelconfig.moc
+mocs: applettab_impl.moc
#>+ 3
+ menutab_impl.moc: $(srcdir)/menutab_impl.h
+@@ -1021,11 +1024,11 @@
+ mocs: menutab_impl.moc
+
+ #>+ 3
-applettab_impl.moc: $(srcdir)/applettab_impl.h
- $(MOC) $(srcdir)/applettab_impl.h -o applettab_impl.moc
-+menutab_impl.moc: $(srcdir)/menutab_impl.h
-+ $(MOC) $(srcdir)/menutab_impl.h -o menutab_impl.moc
++lookandfeelconfig.moc: $(srcdir)/lookandfeelconfig.h
++ $(MOC) $(srcdir)/lookandfeelconfig.h -o lookandfeelconfig.moc
#>+ 2
-mocs: applettab_impl.moc
-+mocs: menutab_impl.moc
++mocs: lookandfeelconfig.moc
#>+ 3
- lookandfeeltab_kcm.moc: $(srcdir)/lookandfeeltab_kcm.h
-@@ -1033,10 +1036,10 @@
+ positionconfig.moc: $(srcdir)/positionconfig.h
+@@ -1092,10 +1095,10 @@
#>+ 3
clean-metasources:
-- -rm -f menutab_impl.moc applettab_impl.moc lookandfeeltab_kcm.moc main.moc hidingtab_impl.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
-+ -rm -f applettab_impl.moc menutab_impl.moc lookandfeeltab_kcm.moc main.moc hidingtab_impl.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
+- -rm -f lookandfeelconfig.moc menutab_impl.moc applettab_impl.moc positionconfig.moc lookandfeeltab_kcm.moc main.moc menuconfig.moc hidingtab_impl.moc hidingconfig.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
++ -rm -f applettab_impl.moc menutab_impl.moc lookandfeelconfig.moc positionconfig.moc lookandfeeltab_kcm.moc main.moc menuconfig.moc hidingtab_impl.moc hidingconfig.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
#>+ 2
--KDE_DIST=applettab_impl.h lookandfeeltab.ui lookandfeeltab_kcm.h advancedOptions.ui panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config.desktop menutab.ui applettab.ui Makefile.in hidingtab.ui lookandfeeltab_kcm.cpp uninstall.desktop Makefile.am
-+KDE_DIST=applettab_impl.h lookandfeeltab.ui lookandfeeltab_kcm.h advancedOptions.ui panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config.desktop menutab.ui applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp Makefile.am
+-KDE_DIST=applettab_impl.h lookandfeelconfig.h lookandfeeltab.ui lookandfeeltab_kcm.h kicker_config_menus.desktop advancedOptions.ui hidingconfig.h panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config_arrangement.desktop kicker_config.desktop menutab.ui menuconfig.h applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp positionconfig.h kicker_config_hiding.desktop Makefile.am
++KDE_DIST=applettab_impl.h lookandfeeltab.ui lookandfeelconfig.h lookandfeeltab_kcm.h kicker_config_menus.desktop advancedOptions.ui hidingconfig.h panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config_arrangement.desktop kicker_config.desktop menutab.ui menuconfig.h applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp positionconfig.h kicker_config_hiding.desktop Makefile.am
#>+ 4
clean-idl:
+@@ -1157,7 +1160,7 @@
+
+
+ #>+ 11
+-kcm_kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/positiontab_impl.cpp $(srcdir)/hidingtab_impl.cpp $(srcdir)/lookandfeeltab_impl.cpp $(srcdir)/menutab_impl.cpp $(srcdir)/extensionInfo.cpp ../../kicker/libkicker/kickerSettings.h $(srcdir)/main.cpp $(srcdir)/advancedDialog.cpp $(srcdir)/positionconfig.cpp $(srcdir)/hidingconfig.cpp $(srcdir)/menuconfig.cpp $(srcdir)/lookandfeelconfig.cpp main_skel.cpp positiontab.cpp hidingtab.cpp lookandfeeltab.cpp menutab.cpp advancedOptions.cpp menutab_impl.moc lookandfeelconfig.moc positionconfig.moc advancedOptions.moc main.moc menuconfig.moc positiontab.moc hidingtab_impl.moc hidingtab.moc hidingconfig.moc menutab.moc lookandfeeltab.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
++kcm_kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/positiontab_impl.cpp $(srcdir)/hidingtab_impl.cpp $(srcdir)/lookandfeeltab_impl.cpp $(srcdir)/menutab_impl.cpp $(srcdir)/extensionInfo.cpp ../../kicker/libkicker/kickerSettings.h $(srcdir)/main.cpp $(srcdir)/advancedDialog.cpp $(srcdir)/positionconfig.cpp $(srcdir)/hidingconfig.cpp $(srcdir)/menuconfig.cpp $(srcdir)/lookandfeelconfig.cpp main_skel.cpp positiontab.cpp hidingtab.cpp lookandfeeltab.cpp menutab.cpp advancedOptions.cpp lookandfeelconfig.moc menutab_impl.moc positionconfig.moc advancedOptions.moc main.moc menuconfig.moc positiontab.moc hidingtab_impl.moc hidingtab.moc hidingconfig.moc menutab.moc lookandfeeltab.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
+ @echo 'creating kcm_kicker_la.all_cpp.cpp ...'; \
+ rm -f kcm_kicker_la.all_cpp.files kcm_kicker_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_kicker_la.all_cpp.final; \
+@@ -1214,8 +1217,8 @@
+ $(srcdir)/positiontab_impl.cpp: positiontab.h hidingtab.h lookandfeeltab.h menutab.h advancedOptions.h
+ lookandfeeltab_kcm.o: lookandfeeltab_kcm.moc
+ positionconfig.lo: positionconfig.moc
+-lookandfeelconfig.lo: lookandfeelconfig.moc
+ applettab_impl.lo: applettab_impl.moc
++lookandfeelconfig.lo: lookandfeelconfig.moc
+ main.o: main.moc
+ lookandfeelconfig.o: lookandfeelconfig.moc
+ menutab_impl.lo: menutab_impl.moc
--- kcontrol/kio/Makefile.in
+++ kcontrol/kio/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -325,6 +325,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16237,7 +20593,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -633,7 +636,7 @@
+@@ -649,7 +652,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16246,7 +20602,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -671,9 +674,9 @@
+@@ -687,9 +690,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16258,7 +20614,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1159,18 +1162,18 @@
+@@ -1175,18 +1178,18 @@
mocs: smbrodlg.moc
#>+ 3
@@ -16283,7 +20639,7 @@
#>+ 3
kproxydlg.moc: $(srcdir)/kproxydlg.h
-@@ -1244,10 +1247,10 @@
+@@ -1260,10 +1263,10 @@
#>+ 3
clean-metasources:
@@ -16296,7 +20652,7 @@
#>+ 13
clean-ui:
-@@ -1309,7 +1312,7 @@
+@@ -1325,7 +1328,7 @@
#>+ 11
@@ -16307,7 +20663,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_kio_la.all_cpp.final; \
--- kcontrol/kio/uasproviders/Makefile.in
+++ kcontrol/kio/uasproviders/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16317,7 +20673,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -561,7 +564,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16326,7 +20682,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -599,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16338,7 +20694,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -744,7 +747,7 @@
+@@ -761,7 +764,7 @@
.NOEXPORT:
#>+ 2
@@ -16349,7 +20705,7 @@
docs-am:
--- kcontrol/knotify/Makefile.in
+++ kcontrol/knotify/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -314,6 +314,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16359,7 +20715,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -619,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16368,7 +20724,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -657,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16382,7 +20738,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/knotify/sounds/Makefile.in
+++ kcontrol/knotify/sounds/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16392,7 +20748,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -645,7 +648,7 @@
+@@ -661,7 +664,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16401,7 +20757,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -683,9 +686,9 @@
+@@ -699,9 +702,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16415,7 +20771,7 @@
mostlyclean-libtool:
--- kcontrol/konq/Makefile.in
+++ kcontrol/konq/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -304,6 +304,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16425,7 +20781,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -619,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16434,7 +20790,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -657,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16446,7 +20802,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1037,7 +1040,7 @@
+@@ -1053,7 +1056,7 @@
-rm -f previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
#>+ 2
@@ -16457,7 +20813,7 @@
clean-idl:
--- kcontrol/konqhtml/Makefile.in
+++ kcontrol/konqhtml/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16467,7 +20823,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -614,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16476,7 +20832,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -652,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16488,7 +20844,35 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1006,25 +1009,25 @@
+@@ -983,13 +986,6 @@
+ mocs: jspolicies.moc
+
+ #>+ 3
+-appearance.moc: $(srcdir)/appearance.h
+- $(MOC) $(srcdir)/appearance.h -o appearance.moc
+-
+-#>+ 2
+-mocs: appearance.moc
+-
+-#>+ 3
+ main.moc: $(srcdir)/main.h
+ $(MOC) $(srcdir)/main.h -o main.moc
+
+@@ -1004,6 +1000,13 @@
+ mocs: jsopts.moc
+
+ #>+ 3
++appearance.moc: $(srcdir)/appearance.h
++ $(MOC) $(srcdir)/appearance.h -o appearance.moc
++
++#>+ 2
++mocs: appearance.moc
++
++#>+ 3
+ javaopts.moc: $(srcdir)/javaopts.h
+ $(MOC) $(srcdir)/javaopts.h -o javaopts.moc
+
+@@ -1032,22 +1035,22 @@
mocs: advancedTabDialog.moc
#>+ 3
@@ -16513,27 +20897,23 @@
#>+ 3
clean-metasources:
-- -rm -f khttpoptdlg.moc jspolicies.moc main.moc jsopts.moc appearance.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
-+ -rm -f khttpoptdlg.moc jspolicies.moc main.moc jsopts.moc appearance.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
+- -rm -f khttpoptdlg.moc filteropts.moc jspolicies.moc appearance.moc main.moc jsopts.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
++ -rm -f khttpoptdlg.moc filteropts.moc jspolicies.moc main.moc jsopts.moc appearance.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
#>+ 2
--KDE_DIST=policydlg.h policies.h pluginopts.h appearance.h main.h jsopts.h advancedTabDialog.h advancedTabOptions.ui khtml_java_js.desktop nsconfigwidget.ui htmlopts.h javaopts.h khttpoptdlg.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am
-+KDE_DIST=policydlg.h policies.h pluginopts.h appearance.h main.h jsopts.h advancedTabDialog.h advancedTabOptions.ui khtml_java_js.desktop nsconfigwidget.ui htmlopts.h khttpoptdlg.h javaopts.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am
+ KDE_DIST=policydlg.h policies.h pluginopts.h appearance.h khtml_filter.desktop main.h jsopts.h advancedTabDialog.h advancedTabOptions.ui khtml_java_js.desktop nsconfigwidget.ui htmlopts.h filteropts.h khttpoptdlg.h javaopts.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am
+@@ -1104,7 +1107,7 @@
- #>+ 5
- clean-ui:
-@@ -1078,7 +1081,7 @@
-
#>+ 11
--kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp nsconfigwidget.cpp advancedTabOptions.cpp khttpoptdlg.moc jspolicies.moc appearance.moc jsopts.moc main.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
-+kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp nsconfigwidget.cpp advancedTabOptions.cpp khttpoptdlg.moc jspolicies.moc appearance.moc jsopts.moc main.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
+-kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp $(srcdir)/filteropts.cpp nsconfigwidget.cpp advancedTabOptions.cpp khttpoptdlg.moc jspolicies.moc filteropts.moc jsopts.moc main.moc appearance.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
++kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp $(srcdir)/filteropts.cpp nsconfigwidget.cpp advancedTabOptions.cpp khttpoptdlg.moc jspolicies.moc filteropts.moc appearance.moc jsopts.moc main.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
@echo 'creating kcm_konqhtml_la.all_cpp.cpp ...'; \
rm -f kcm_konqhtml_la.all_cpp.files kcm_konqhtml_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_konqhtml_la.all_cpp.final; \
--- kcontrol/konsole/Makefile.in
+++ kcontrol/konsole/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16543,7 +20923,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -607,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16552,7 +20932,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -645,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16566,7 +20946,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/krdb/ad/Makefile.in
+++ kcontrol/krdb/ad/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -264,6 +264,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16576,7 +20956,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -561,7 +564,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16585,7 +20965,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -599,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16597,7 +20977,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
-@@ -766,7 +769,7 @@
+@@ -782,7 +785,7 @@
.NOEXPORT:
#>+ 2
@@ -16608,7 +20988,7 @@
docs-am:
--- kcontrol/krdb/kcs/Makefile.in
+++ kcontrol/krdb/kcs/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16618,7 +20998,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -559,7 +562,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16627,7 +21007,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -597,9 +600,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16639,7 +21019,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -745,7 +748,7 @@
+@@ -761,7 +764,7 @@
.NOEXPORT:
#>+ 2
@@ -16650,7 +21030,7 @@
docs-am:
--- kcontrol/krdb/Makefile.in
+++ kcontrol/krdb/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -305,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16660,7 +21040,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -605,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16669,7 +21049,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -643,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16683,7 +21063,7 @@
clean-noinstLTLIBRARIES:
--- kcontrol/krdb/pics/Makefile.in
+++ kcontrol/krdb/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16693,7 +21073,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16702,7 +21082,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16716,7 +21096,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/HighContrastDark/Makefile.in
+++ kcontrol/krdb/themes/HighContrastDark/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16726,7 +21106,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16735,7 +21115,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16749,7 +21129,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
+++ kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16759,7 +21139,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16768,7 +21148,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16782,7 +21162,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/HighContrastLight/Makefile.in
+++ kcontrol/krdb/themes/HighContrastLight/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16792,7 +21172,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16801,7 +21181,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16815,7 +21195,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
+++ kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16825,7 +21205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16834,7 +21214,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16848,7 +21228,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/KDE_Classic/Makefile.in
+++ kcontrol/krdb/themes/KDE_Classic/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16858,7 +21238,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16867,7 +21247,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16881,7 +21261,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Keramik/Makefile.in
+++ kcontrol/krdb/themes/Keramik/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16891,7 +21271,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16900,7 +21280,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16914,7 +21294,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Makefile.in
+++ kcontrol/krdb/themes/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16924,7 +21304,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -560,7 +563,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16933,7 +21313,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -598,9 +601,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16947,7 +21327,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Plastik/Makefile.in
+++ kcontrol/krdb/themes/Plastik/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16957,7 +21337,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16966,7 +21346,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16980,7 +21360,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Platinum/Makefile.in
+++ kcontrol/krdb/themes/Platinum/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16990,7 +21370,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16999,7 +21379,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17013,7 +21393,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Redmond/Makefile.in
+++ kcontrol/krdb/themes/Redmond/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17023,7 +21403,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17032,7 +21412,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17046,7 +21426,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Sunshine/Makefile.in
+++ kcontrol/krdb/themes/Sunshine/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17056,7 +21436,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17065,7 +21445,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17079,7 +21459,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/YellowOnBlue/Makefile.in
+++ kcontrol/krdb/themes/YellowOnBlue/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17089,7 +21469,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17098,7 +21478,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17112,7 +21492,7 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
+++ kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17122,7 +21502,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17131,7 +21511,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17145,7 +21525,7 @@
mostlyclean-libtool:
--- kcontrol/kthememanager/Makefile.in
+++ kcontrol/kthememanager/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -305,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17155,7 +21535,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -610,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17164,7 +21544,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -648,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17178,7 +21558,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/launch/Makefile.in
+++ kcontrol/launch/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17188,7 +21568,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17197,7 +21577,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17211,7 +21591,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/locale/default/Makefile.in
+++ kcontrol/locale/default/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17221,7 +21601,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17230,7 +21610,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17244,7 +21624,7 @@
mostlyclean-libtool:
--- kcontrol/locale/Makefile.in
+++ kcontrol/locale/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -319,6 +319,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17254,7 +21634,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -620,7 +623,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17263,7 +21643,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -658,9 +661,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17275,7 +21655,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1063,11 +1066,11 @@
+@@ -1086,11 +1089,11 @@
mocs: klocalesample.moc
#>+ 3
@@ -17290,7 +21670,7 @@
#>+ 3
localemon.moc: $(srcdir)/localemon.h
-@@ -1077,11 +1080,11 @@
+@@ -1100,11 +1103,11 @@
mocs: localemon.moc
#>+ 3
@@ -17305,7 +21685,7 @@
#>+ 3
kcmlocale.moc: $(srcdir)/kcmlocale.h
-@@ -1099,7 +1102,7 @@
+@@ -1122,7 +1125,7 @@
#>+ 3
clean-metasources:
@@ -17314,7 +21694,7 @@
#>+ 2
KDE_DIST=TIMEZONES language.desktop Makefile.in Makefile.am
-@@ -1150,7 +1153,7 @@
+@@ -1173,7 +1176,7 @@
#>+ 11
@@ -17325,7 +21705,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_locale_la.all_cpp.final; \
--- kcontrol/locale/pics/Makefile.in
+++ kcontrol/locale/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17335,7 +21715,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17344,7 +21724,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17358,7 +21738,7 @@
mostlyclean-libtool:
--- kcontrol/Makefile.in
+++ kcontrol/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -272,6 +272,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17368,7 +21748,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -580,7 +583,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17377,7 +21757,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17391,7 +21771,7 @@
mostlyclean-libtool:
--- kcontrol/nics/Makefile.in
+++ kcontrol/nics/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17401,7 +21781,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17410,7 +21790,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17424,7 +21804,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/performance/Makefile.in
+++ kcontrol/performance/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17434,7 +21814,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -607,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17443,7 +21823,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -645,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17457,7 +21837,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/pics/Makefile.in
+++ kcontrol/pics/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17467,7 +21847,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17476,7 +21856,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17488,17 +21868,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -707,548 +710,548 @@
+@@ -723,581 +726,581 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr22-app-arts.png cr64-app-locale.png cr48-app-kcmx.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png cr48-app-input_devices_settings.png crsc-app-samba.svgz cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr48-app-multimedia.png cr22-app-hwinfo.png cr32-app-kcmx.png cr48-app-date.png cr48-app-bell.png cr32-app-style.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr64-app-hwinfo.png cr48-app-key_bindings.png cr22-app-energy.png cr128-app-fonts.png cr16-app-iconthemes.png cr16-app-energy_star.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr48-app-colors.png cr64-app-kcmpci.png cr64-app-energy.png cr48-app-energy_star.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png cr128-app-kcmkwm.png crsc-app-filetypes.svgz cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr128-app-proxy.png cr32-app-date.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr32-app-keyboard_layout.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr48-app-usb.png cr32-app-enhanced_browsing.png cr128-app-energy.png cr128-app-kdmconfig.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr128-app-help_index.png cr22-app-cache.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr32-app-kcmkwm.png cr48-app-access.png cr22-app-bell.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr22-app-kcmkwm.png cr32-app-kscreensaver.png cr32-app-kdmconfig.png cr22-app-proxy.png cr16-app-date.png cr22-app-kdmconfig.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr48-app-kthememgr.png cr128-app-bell.png cr32-app-colors.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr16-app-proxy.png cr64-app-energy_star.png cr16-app-hwinfo.png cr64-app-background.png cr22-app-kthememgr.png cr32-app-kcmpartitions.png cr22-app-background.png cr128-app-kcmmemory.png cr22-app-date.png cr32-app-arts.png cr16-app-bell.png cr48-app-agent.png cr48-app-kcmsystem.png cr32-app-kcmsystem.png cr48-app-looknfeel.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png crsc-app-kcmkwm.svgz cr32-app-kcmkicker.png cr22-app-personal.png cr48-app-kscreensaver.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr128-app-kcmdevices.png cr16-app-personal.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png cr128-app-cache.png cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr64-app-bell.png cr128-app-date.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr64-app-kcmdf.png cr22-app-access.png cr48-app-samba.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr48-app-background.png cr128-app-personal.png cr48-app-knotify.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr32-app-access.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr22-app-fonts.png cr16-app-kthememgr.png cr32-app-iconthemes.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am
-+KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr64-app-locale.png cr48-app-kcmx.png cr22-app-arts.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png crsc-app-samba.svgz cr48-app-input_devices_settings.png cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr22-app-hwinfo.png cr48-app-multimedia.png cr32-app-kcmx.png cr32-app-style.png cr48-app-bell.png cr48-app-date.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr48-app-key_bindings.png cr64-app-hwinfo.png cr22-app-energy.png cr16-app-iconthemes.png cr128-app-fonts.png cr16-app-energy_star.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr64-app-kcmpci.png cr48-app-colors.png cr64-app-energy.png cr48-app-energy_star.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png cr128-app-kcmkwm.png crsc-app-filetypes.svgz cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr32-app-date.png cr128-app-proxy.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-keyboard_layout.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr32-app-enhanced_browsing.png cr48-app-usb.png cr128-app-kdmconfig.png cr128-app-energy.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr22-app-cache.png cr128-app-help_index.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr22-app-bell.png cr32-app-kcmkwm.png cr48-app-access.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr32-app-kscreensaver.png cr22-app-kcmkwm.png cr32-app-kdmconfig.png cr22-app-proxy.png cr16-app-date.png cr22-app-kdmconfig.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr128-app-bell.png cr48-app-kthememgr.png cr32-app-colors.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr16-app-proxy.png cr16-app-hwinfo.png cr64-app-energy_star.png cr22-app-kthememgr.png cr64-app-background.png cr22-app-background.png cr32-app-kcmpartitions.png cr128-app-kcmmemory.png cr22-app-date.png cr32-app-arts.png cr16-app-bell.png cr48-app-kcmsystem.png cr48-app-agent.png cr32-app-kcmsystem.png cr48-app-looknfeel.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png cr32-app-kcmkicker.png crsc-app-kcmkwm.svgz cr48-app-kscreensaver.png cr22-app-personal.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr16-app-personal.png cr128-app-kcmdevices.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png cr128-app-cache.png cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr128-app-date.png cr64-app-bell.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr48-app-samba.png cr64-app-kcmdf.png cr22-app-access.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr128-app-personal.png cr48-app-knotify.png cr48-app-background.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr32-app-access.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-fonts.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am
+-KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr22-app-arts.png cr64-app-locale.png cr48-app-kcmx.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png cr48-app-input_devices_settings.png crsc-app-samba.svgz cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr48-app-multimedia.png cr22-app-hwinfo.png cr32-app-kcmx.png cr48-app-date.png cr48-app-bell.png cr32-app-style.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr64-app-hwinfo.png cr48-app-key_bindings.png cr22-app-energy.png cr128-app-fonts.png cr16-app-iconthemes.png cr16-app-energy_star.png cr16-device-laptop.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr48-app-colors.png cr64-app-kcmpci.png cr64-app-energy.png cr48-app-energy_star.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png cr128-app-kcmkwm.png crsc-app-filetypes.svgz cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr128-device-laptop.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr128-app-proxy.png cr32-app-date.png cr32-app-ieee1394.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr32-app-keyboard_layout.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr48-app-usb.png cr32-app-enhanced_browsing.png cr128-app-energy.png cr128-app-kdmconfig.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr128-app-help_index.png cr22-app-cache.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr32-app-kcmkwm.png cr48-app-access.png cr22-app-bell.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr22-app-kcmkwm.png cr32-app-kscreensaver.png cr32-app-kdmconfig.png cr22-app-proxy.png cr16-app-date.png cr22-app-kdmconfig.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr48-app-kthememgr.png cr128-app-bell.png cr32-app-colors.png cr64-device-laptop.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr64-app-ieee1394.png cr16-app-proxy.png cr64-app-energy_star.png cr16-app-hwinfo.png cr64-app-background.png cr22-app-kthememgr.png cr32-app-kcmpartitions.png cr22-app-background.png cr128-app-kcmmemory.png cr22-app-date.png cr32-app-arts.png cr16-app-bell.png cr48-app-agent.png cr48-app-kcmsystem.png cr32-app-kcmsystem.png cr48-device-laptop.png cr48-app-looknfeel.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png crsc-app-kcmkwm.svgz cr32-app-kcmkicker.png cr22-app-personal.png cr48-app-kscreensaver.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr128-app-kcmdevices.png cr16-app-personal.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr16-app-ieee1394.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png crsc-app-ieee1394.svgz cr128-app-cache.png cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr64-app-bell.png cr128-app-date.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr48-app-samba.png cr64-app-kcmdf.png cr22-app-access.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr48-app-background.png cr128-app-personal.png cr48-app-knotify.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr22-app-ieee1394.png cr48-app-ieee1394.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png crsc-device-laptop.svgz cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png cr32-device-laptop.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr22-device-laptop.png cr32-app-access.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr22-app-fonts.png cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am
++KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr64-app-locale.png cr48-app-kcmx.png cr22-app-arts.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png crsc-app-samba.svgz cr48-app-input_devices_settings.png cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr22-app-hwinfo.png cr48-app-multimedia.png cr32-app-kcmx.png cr32-app-style.png cr48-app-bell.png cr48-app-date.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr48-app-key_bindings.png cr64-app-hwinfo.png cr22-app-energy.png cr16-app-iconthemes.png cr128-app-fonts.png cr16-app-energy_star.png cr16-device-laptop.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr64-app-kcmpci.png cr48-app-colors.png cr64-app-energy.png cr48-app-energy_star.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png cr128-app-kcmkwm.png crsc-app-filetypes.svgz cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr128-device-laptop.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr32-app-date.png cr128-app-proxy.png cr32-app-ieee1394.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-keyboard_layout.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr32-app-enhanced_browsing.png cr48-app-usb.png cr128-app-kdmconfig.png cr128-app-energy.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr128-app-help_index.png cr22-app-cache.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr22-app-bell.png cr32-app-kcmkwm.png cr48-app-access.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr32-app-kscreensaver.png cr22-app-kcmkwm.png cr32-app-kdmconfig.png cr22-app-proxy.png cr16-app-date.png cr22-app-kdmconfig.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr128-app-bell.png cr48-app-kthememgr.png cr32-app-colors.png cr64-device-laptop.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr64-app-ieee1394.png cr16-app-proxy.png cr16-app-hwinfo.png cr64-app-energy_star.png cr22-app-kthememgr.png cr64-app-background.png cr22-app-background.png cr32-app-kcmpartitions.png cr128-app-kcmmemory.png cr22-app-date.png cr16-app-bell.png cr32-app-arts.png cr48-app-kcmsystem.png cr48-app-agent.png cr32-app-kcmsystem.png cr48-app-looknfeel.png cr48-device-laptop.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png cr32-app-kcmkicker.png crsc-app-kcmkwm.svgz cr48-app-kscreensaver.png cr22-app-personal.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr16-app-personal.png cr128-app-kcmdevices.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr16-app-ieee1394.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png cr128-app-cache.png crsc-app-ieee1394.svgz cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr128-app-date.png cr64-app-bell.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr22-app-access.png cr48-app-samba.png cr64-app-kcmdf.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr128-app-personal.png cr48-app-knotify.png cr48-app-background.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr22-app-ieee1394.png cr48-app-ieee1394.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png crsc-device-laptop.svgz cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png cr32-device-laptop.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr32-app-access.png cr22-device-laptop.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-fonts.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am
#>+ 2
docs-am:
- #>+ 537
+ #>+ 570
install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
@@ -17519,6 +21899,8 @@
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
++ $(INSTALL_DATA) $(srcdir)/cr64-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
@@ -17526,8 +21908,11 @@
- $(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices
+- $(INSTALL_DATA) $(srcdir)/cr48-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
+- $(INSTALL_DATA) $(srcdir)/cr22-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
@@ -17546,13 +21931,15 @@
- $(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
+- $(INSTALL_DATA) $(srcdir)/cr32-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
@@ -17575,12 +21962,14 @@
- $(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
-- $(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
$(INSTALL_DATA) $(srcdir)/cr48-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
@@ -17592,89 +21981,23 @@
- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
+- $(INSTALL_DATA) $(srcdir)/cr16-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
@@ -17683,72 +22006,35 @@
- $(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices
+ $(INSTALL_DATA) $(srcdir)/cr128-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
- $(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-ieee1394.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
@@ -17763,19 +22049,20 @@
- $(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
@@ -17789,7 +22076,10 @@
- $(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
-- $(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
@@ -17800,40 +22090,75 @@
- $(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
- $(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
++ $(INSTALL_DATA) $(srcdir)/crsc-device-laptop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
++ $(INSTALL_DATA) $(srcdir)/cr16-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
@@ -17847,52 +22172,186 @@
- $(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
-- $(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
+- $(INSTALL_DATA) $(srcdir)/crsc-device-laptop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
+ $(INSTALL_DATA) $(srcdir)/cr22-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
+- $(INSTALL_DATA) $(srcdir)/cr64-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-ieee1394.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices
++ $(INSTALL_DATA) $(srcdir)/cr48-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
++ $(INSTALL_DATA) $(srcdir)/cr32-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
@@ -17900,38 +22359,27 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
+ $(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
-- $(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
+ $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
@@ -17939,12 +22387,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
- $(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
@@ -17956,40 +22399,16 @@
+ $(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
- $(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
-- $(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
$(INSTALL_DATA) $(srcdir)/cr22-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
@@ -18021,66 +22440,121 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
@@ -18092,20 +22566,38 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
@@ -18113,33 +22605,38 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
@@ -18158,94 +22655,28 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
@@ -18255,6 +22686,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
@@ -18274,6 +22706,8 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
@@ -18284,24 +22718,6 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
@@ -18320,6 +22736,24 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
@@ -18330,6 +22764,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
@@ -18347,21 +22782,23 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
@@ -18393,6 +22830,8 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
@@ -18410,9 +22849,9 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
@@ -18420,6 +22859,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
@@ -18466,8 +22906,10 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
@@ -18490,6 +22932,7 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
@@ -18514,7 +22957,7 @@
force-reedit:
--- kcontrol/privacy/Makefile.in
+++ kcontrol/privacy/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18524,7 +22967,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18533,7 +22976,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18547,7 +22990,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/randr/Makefile.in
+++ kcontrol/randr/Makefile.in
-@@ -333,6 +333,9 @@
+@@ -326,6 +326,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18557,7 +23000,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -651,7 +654,7 @@
+@@ -636,7 +639,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18566,7 +23009,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -689,9 +692,9 @@
+@@ -674,9 +677,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18580,7 +23023,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/samba/Makefile.in
+++ kcontrol/samba/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18590,7 +23033,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18599,7 +23042,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18613,7 +23056,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/screensaver/Makefile.in
+++ kcontrol/screensaver/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18623,7 +23066,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -607,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18632,7 +23075,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -645,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18646,7 +23089,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/smartcard/Makefile.in
+++ kcontrol/smartcard/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18656,7 +23099,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18665,7 +23108,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18679,7 +23122,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/smserver/Makefile.in
+++ kcontrol/smserver/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18689,7 +23132,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18698,7 +23141,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18712,7 +23155,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/spellchecking/Makefile.in
+++ kcontrol/spellchecking/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18722,7 +23165,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18731,7 +23174,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18745,7 +23188,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/style/keramik/Makefile.in
+++ kcontrol/style/keramik/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18755,7 +23198,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -590,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18764,7 +23207,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -628,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18778,7 +23221,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/style/Makefile.in
+++ kcontrol/style/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -315,6 +315,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18788,7 +23231,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -618,7 +621,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18797,7 +23240,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -656,9 +659,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18811,7 +23254,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/taskbar/Makefile.in
+++ kcontrol/taskbar/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18821,7 +23264,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18830,7 +23273,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18844,7 +23287,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/usbview/Makefile.in
+++ kcontrol/usbview/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18854,7 +23297,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -598,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18863,7 +23306,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18877,7 +23320,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/view1394/Makefile.in
+++ kcontrol/view1394/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18887,7 +23330,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -600,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18896,7 +23339,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -638,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18910,7 +23353,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/xinerama/Makefile.in
+++ kcontrol/xinerama/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18920,7 +23363,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18929,7 +23372,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18943,7 +23386,7 @@
@$(NORMAL_INSTALL)
--- kdcop/Makefile.in
+++ kdcop/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -307,6 +307,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18953,7 +23396,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -606,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18962,7 +23405,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -644,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18976,7 +23419,7 @@
@$(NORMAL_INSTALL)
--- kdebugdialog/Makefile.in
+++ kdebugdialog/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18986,7 +23429,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
+@@ -586,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18995,7 +23438,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -608,9 +611,9 @@
+@@ -624,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19007,9 +23450,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+--- kdeeject/Makefile.in
++++ kdeeject/Makefile.in
+@@ -254,6 +254,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -544,7 +547,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -582,9 +585,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
--- kdepasswd/kcm/Makefile.in
+++ kdepasswd/kcm/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -313,6 +313,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19019,7 +23495,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -620,7 +623,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19028,7 +23504,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -658,9 +661,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19042,7 +23518,7 @@
@$(NORMAL_INSTALL)
--- kdepasswd/kcm/pics/Makefile.in
+++ kdepasswd/kcm/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19052,7 +23528,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -558,7 +561,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19061,7 +23537,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -596,9 +599,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19073,7 +23549,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -741,7 +744,7 @@
+@@ -757,7 +760,7 @@
.NOEXPORT:
#>+ 2
@@ -19084,7 +23560,7 @@
docs-am:
--- kdepasswd/Makefile.in
+++ kdepasswd/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -315,6 +315,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19094,7 +23570,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -613,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19103,7 +23579,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -651,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19117,7 +23593,7 @@
@$(NORMAL_INSTALL)
--- kdeprint/descriptions/Makefile.in
+++ kdeprint/descriptions/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19127,7 +23603,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -574,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19136,7 +23612,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -612,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19150,7 +23626,7 @@
@rm -f sortthem$(EXEEXT)
--- kdeprint/kdeprintfax/Makefile.in
+++ kdeprint/kdeprintfax/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -308,6 +308,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19160,7 +23636,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -613,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19169,7 +23645,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -651,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19181,52 +23657,61 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1012,35 +1015,35 @@
+@@ -1028,38 +1031,38 @@
-rm -f conffilters.moc faxab.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
#>+ 2
--KDE_DIST=conffax.h faxfilters faxctrl.h Makefile.in conffilters.h crsc-app-kdeprintfax.svgz anytops cr16-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png faxab.h configdlg.h cr64-app-kdeprintfax.png kdeprintfax.h cr48-app-kdeprintfax.png filterdlg.h defcmds.h confgeneral.h cr32-app-kdeprintfax.png kdeprintfaxui.rc cr128-app-kdeprintfax.png Makefile.am confsystem.h
-+KDE_DIST=conffax.h faxfilters faxctrl.h conffilters.h Makefile.in crsc-app-kdeprintfax.svgz anytops cr16-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png faxab.h configdlg.h cr64-app-kdeprintfax.png kdeprintfax.h cr48-app-kdeprintfax.png filterdlg.h confgeneral.h defcmds.h cr32-app-kdeprintfax.png kdeprintfaxui.rc cr128-app-kdeprintfax.png Makefile.am confsystem.h
+-KDE_DIST=conffax.h faxfilters faxctrl.h hi64-app-kdeprintfax.png hi16-app-kdeprintfax.png Makefile.in conffilters.h anytops hi128-app-kdeprintfax.png hi48-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png hisc-app-kdeprintfax.svgz faxab.h hi32-app-kdeprintfax.png configdlg.h kdeprintfax.h filterdlg.h defcmds.h confgeneral.h kdeprintfaxui.rc hi22-app-kdeprintfax.png Makefile.am confsystem.h
++KDE_DIST=conffax.h faxfilters faxctrl.h hi64-app-kdeprintfax.png hi16-app-kdeprintfax.png conffilters.h Makefile.in anytops hi128-app-kdeprintfax.png hi48-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png hisc-app-kdeprintfax.svgz hi32-app-kdeprintfax.png faxab.h configdlg.h kdeprintfax.h filterdlg.h confgeneral.h defcmds.h kdeprintfaxui.rc hi22-app-kdeprintfax.png Makefile.am confsystem.h
#>+ 2
docs-am:
- #>+ 25
+ #>+ 28
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdeprintfax.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdeprintfax.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-kdeprintfax.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdeprintfax.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdeprintfax.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdeprintfax.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdeprintfax.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdeprintfax.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdeprintfax.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-kdeprintfax.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdeprintfax.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdeprintfax.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
$(mkinstalldirs) $(DESTDIR)$(picdir)/crystalsvg/16x16/actions
$(INSTALL_DATA) $(srcdir)/cr16-action-abentry.png $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdeprintfax.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdeprintfax.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdeprintfax.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdeprintfax.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdeprintfax.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdeprintfax.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdeprintfax.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdeprintfax.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdeprintfax.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdeprintfax.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
-rm -f $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
#>+ 15
--- kdeprint/kdeprint_part/Makefile.in
+++ kdeprint/kdeprint_part/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19236,7 +23721,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -605,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19245,7 +23730,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -643,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19259,7 +23744,7 @@
@$(NORMAL_INSTALL)
--- kdeprint/kjobviewer/Makefile.in
+++ kdeprint/kjobviewer/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -314,6 +314,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19269,7 +23754,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -623,7 +626,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19278,7 +23763,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -661,9 +664,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19290,51 +23775,51 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1051,29 +1054,29 @@
+@@ -1067,29 +1070,29 @@
#>+ 25
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjobviewer.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjobviewer.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kjobviewer.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kjobviewer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjobviewer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kjobviewer.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kjobviewer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-kjobviewer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kjobviewer.svgz
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjobviewer.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kjobviewer.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjobviewer.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-kjobviewer.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjobviewer.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjobviewer.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kjobviewer.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjobviewer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjobviewer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kjobviewer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kjobviewer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kjobviewer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kjobviewer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kjobviewer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kjobviewer.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kjobviewer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kjobviewer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjobviewer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjobviewer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjobviewer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
#>+ 15
force-reedit:
--- kdeprint/kprinter/Makefile.in
+++ kdeprint/kprinter/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -308,6 +308,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19344,7 +23829,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -613,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19353,7 +23838,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -651,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19367,7 +23852,7 @@
@$(NORMAL_INSTALL)
--- kdeprint/Makefile.in
+++ kdeprint/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19377,7 +23862,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19386,7 +23871,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19400,7 +23885,7 @@
mostlyclean-libtool:
--- kdeprint/printmgr/Makefile.in
+++ kdeprint/printmgr/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19410,7 +23895,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19419,7 +23904,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19431,60 +23916,51 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -918,7 +921,7 @@
+@@ -945,29 +948,29 @@
-
- #>+ 2
--KDE_DIST=cr64-app-printmgr.png Makefile.in cr32-app-printmgr.png printmgr.desktop cr128-app-printmgr.png cr22-app-printmgr.png crsc-app-printmgr.svgz cr48-app-printmgr.png cr16-app-printmgr.png printers.desktop Makefile.am
-+KDE_DIST=cr64-app-printmgr.png Makefile.in cr32-app-printmgr.png cr128-app-printmgr.png printmgr.desktop cr22-app-printmgr.png crsc-app-printmgr.svgz cr48-app-printmgr.png cr16-app-printmgr.png printers.desktop Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -929,29 +932,29 @@
-
#>+ 25
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/printmgr.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/printmgr.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/printmgr.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/printmgr.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-printmgr.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/printmgr.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/printmgr.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/printmgr.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/printmgr.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/printmgr.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/printmgr.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/printmgr.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/printmgr.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-printmgr.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/printmgr.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/printmgr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/printmgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/printmgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/printmgr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/printmgr.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/printmgr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/printmgr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/printmgr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/printmgr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/printmgr.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/printmgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/printmgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/printmgr.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
#>+ 15
force-reedit:
--- kdeprint/slave/Makefile.in
+++ kdeprint/slave/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19494,7 +23970,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -613,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19503,7 +23979,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -651,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19517,7 +23993,7 @@
@$(NORMAL_INSTALL)
--- kdeprint/slave/mimetypes/Makefile.in
+++ kdeprint/slave/mimetypes/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19527,7 +24003,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -553,7 +556,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19536,7 +24012,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -591,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19550,7 +24026,7 @@
mostlyclean-libtool:
--- kdeprint/slave/templates/Makefile.in
+++ kdeprint/slave/templates/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19560,7 +24036,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -580,7 +583,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19569,7 +24045,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19583,7 +24059,7 @@
mostlyclean-libtool:
--- kdesktop/init/Makefile.in
+++ kdesktop/init/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19593,7 +24069,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -572,7 +575,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19602,7 +24078,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -610,9 +613,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19616,7 +24092,7 @@
mostlyclean-libtool:
--- kdesktop/init/Templates/Makefile.in
+++ kdesktop/init/Templates/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19626,7 +24102,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -568,7 +571,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19635,7 +24111,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -606,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19647,7 +24123,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -775,7 +778,7 @@
+@@ -791,7 +794,7 @@
.NOEXPORT:
#>+ 2
@@ -19658,7 +24134,7 @@
docs-am:
--- kdesktop/kwebdesktop/Makefile.in
+++ kdesktop/kwebdesktop/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19668,7 +24144,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -599,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19677,7 +24153,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -637,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19691,7 +24167,7 @@
@$(NORMAL_INSTALL)
--- kdesktop/lock/Makefile.in
+++ kdesktop/lock/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19701,7 +24177,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -593,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19710,7 +24186,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -631,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19724,7 +24200,7 @@
@$(NORMAL_INSTALL)
--- kdesktop/Makefile.in
+++ kdesktop/Makefile.in
-@@ -356,6 +356,9 @@
+@@ -367,6 +367,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19734,7 +24210,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -694,7 +697,7 @@
+@@ -706,7 +709,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -19743,7 +24219,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -732,9 +735,9 @@
+@@ -744,9 +747,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19755,7 +24231,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1429,18 +1432,18 @@
+@@ -1420,18 +1423,18 @@
$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
#>+ 3
@@ -19780,7 +24256,7 @@
#>+ 3
startupid.moc: $(srcdir)/startupid.h
-@@ -1464,11 +1467,11 @@
+@@ -1455,11 +1458,11 @@
mocs: desktop.moc
#>+ 3
@@ -19795,7 +24271,7 @@
#>+ 3
kcustommenu.moc: $(srcdir)/kcustommenu.h
-@@ -1478,11 +1481,11 @@
+@@ -1469,11 +1472,11 @@
mocs: kcustommenu.moc
#>+ 3
@@ -19810,7 +24286,7 @@
#>+ 3
xautolock.moc: $(srcdir)/xautolock.h
-@@ -1509,7 +1512,7 @@
+@@ -1500,7 +1503,7 @@
#>+ 3
clean-metasources:
@@ -19818,8 +24294,8 @@
+ -rm -f krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc
#>+ 2
- KDE_DIST=DESIGN Makefile.in kdesktop.kcfg kdesktop_custom_menu1 klaunchsettings.kcfgc kdesktopSetAsBackground.desktop minicli_ui.ui kshadowengine.h configure.in.in kfileividesktop.h kdesktopshadowsettings.h kdesktop_custom_menu2 kcustommenu.h kdesktopbindings.cpp kshadowsettings.h kdesktopsettings.kcfgc kdesktop.desktop klaunch.kcfg kdiconview.h kdeeject Makefile.am
-@@ -1578,7 +1581,7 @@
+ KDE_DIST=DESIGN Makefile.in kdesktop.kcfg kdesktop_custom_menu1 klaunchsettings.kcfgc kdesktopSetAsBackground.desktop minicli_ui.ui kshadowengine.h configure.in.in kfileividesktop.h kdesktopshadowsettings.h kdesktop_custom_menu2 kcustommenu.h kdesktopbindings.cpp kshadowsettings.h kdesktopsettings.kcfgc kdesktop.desktop klaunch.kcfg kdiconview.h Makefile.am
+@@ -1569,7 +1572,7 @@
#>+ 11
@@ -19828,7 +24304,7 @@
@echo 'creating libkdeinit_kdesktop_la.all_cc.cc ...'; \
rm -f libkdeinit_kdesktop_la.all_cc.files libkdeinit_kdesktop_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cc.final; \
-@@ -1590,7 +1593,7 @@
+@@ -1581,7 +1584,7 @@
rm -f libkdeinit_kdesktop_la.all_cc.final libkdeinit_kdesktop_la.all_cc.files
#>+ 11
@@ -19839,7 +24315,7 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cpp.final; \
--- kdesktop/patterns/Makefile.in
+++ kdesktop/patterns/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19849,7 +24325,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19858,7 +24334,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19872,7 +24348,7 @@
mostlyclean-libtool:
--- kdesktop/pics/Makefile.in
+++ kdesktop/pics/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19882,7 +24358,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19891,7 +24367,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19905,7 +24381,7 @@
mostlyclean-libtool:
--- kdesktop/programs/Makefile.in
+++ kdesktop/programs/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19915,7 +24391,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19924,7 +24400,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19938,7 +24414,7 @@
mostlyclean-libtool:
--- kdesu/kdesu/Makefile.in
+++ kdesu/kdesu/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19948,7 +24424,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
+@@ -586,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19957,7 +24433,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -608,9 +611,9 @@
+@@ -624,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19971,7 +24447,7 @@
@$(NORMAL_INSTALL)
--- kdesu/kdesud/Makefile.in
+++ kdesu/kdesud/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19981,7 +24457,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -588,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19990,7 +24466,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -626,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20004,7 +24480,7 @@
@$(NORMAL_INSTALL)
--- kdesu/Makefile.in
+++ kdesu/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -267,6 +267,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20014,7 +24490,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -557,7 +560,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20023,7 +24499,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -595,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20037,7 +24513,7 @@
mostlyclean-libtool:
--- kdialog/Makefile.in
+++ kdialog/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20047,7 +24523,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -587,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20056,7 +24532,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -625,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20070,7 +24546,7 @@
@$(NORMAL_INSTALL)
--- kdm/backend/Makefile.in
+++ kdm/backend/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -304,6 +304,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20080,7 +24556,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -621,7 +624,7 @@
+@@ -637,7 +640,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -20089,7 +24565,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -659,9 +662,9 @@
+@@ -675,9 +678,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20103,7 +24579,7 @@
@$(NORMAL_INSTALL)
--- kdm/kfrontend/Makefile.in
+++ kdm/kfrontend/Makefile.in
-@@ -331,6 +331,9 @@
+@@ -345,6 +345,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20113,7 +24589,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -615,7 +618,7 @@
+@@ -631,7 +634,7 @@
xdg_menudir = @xdg_menudir@
# use 'make GENKDMCONF_FLAGS=... install' to override
@@ -20122,7 +24598,7 @@
SUBDIRS = themer themes pics sessions
AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \
-I$(top_srcdir)/kdmlib $(all_includes)
-@@ -670,7 +673,7 @@
+@@ -686,7 +689,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -20131,7 +24607,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -708,9 +711,9 @@
+@@ -724,9 +727,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20145,7 +24621,7 @@
@$(NORMAL_INSTALL)
--- kdm/kfrontend/pics/Makefile.in
+++ kdm/kfrontend/pics/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20155,7 +24631,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20164,7 +24640,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20178,7 +24654,7 @@
mostlyclean-libtool:
--- kdm/kfrontend/sessions/Makefile.in
+++ kdm/kfrontend/sessions/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20188,7 +24664,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -599,7 +602,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20197,7 +24673,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -637,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20209,7 +24685,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
kde.desktop: $(top_builddir)/config.status $(srcdir)/kde.desktop.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -785,7 +788,7 @@
+@@ -801,7 +804,7 @@
.NOEXPORT:
#>+ 2
@@ -20220,7 +24696,7 @@
docs-am:
--- kdm/kfrontend/themer/Makefile.in
+++ kdm/kfrontend/themer/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20230,7 +24706,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20239,7 +24715,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20251,7 +24727,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-@@ -861,18 +864,18 @@
+@@ -878,18 +881,18 @@
mocs: kdmitem.moc
#>+ 3
@@ -20276,7 +24752,7 @@
#>+ 3
kdmrect.moc: $(srcdir)/kdmrect.h
-@@ -883,7 +886,7 @@
+@@ -900,7 +903,7 @@
#>+ 3
clean-metasources:
@@ -20285,7 +24761,7 @@
#>+ 2
KDE_DIST=Makefile.in kdmthemer.h kdmitem.h kdmlayout.h kdmpixmap.h kdmlabel.h kdmrect.h Makefile.am
-@@ -930,7 +933,7 @@
+@@ -947,7 +950,7 @@
#>+ 11
@@ -20294,7 +24770,7 @@
@echo 'creating libkdmthemer_a.all_cpp.cpp ...'; \
rm -f libkdmthemer_a.all_cpp.files libkdmthemer_a.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdmthemer_a.all_cpp.final; \
-@@ -976,8 +979,8 @@
+@@ -989,8 +992,8 @@
kdmlabel.o: kdmlabel.moc
$(srcdir)/kdmitem.cpp: ../../config.ci
$(srcdir)/kdmlayout.cpp: ../../config.ci
@@ -20306,7 +24782,7 @@
nmcheck:
--- kdm/kfrontend/themes/circles/Makefile.in
+++ kdm/kfrontend/themes/circles/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20316,7 +24792,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -560,7 +563,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20325,7 +24801,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -598,9 +601,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20339,7 +24815,7 @@
mostlyclean-libtool:
--- kdm/kfrontend/themes/Makefile.in
+++ kdm/kfrontend/themes/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20349,7 +24825,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20358,7 +24834,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20372,7 +24848,7 @@
mostlyclean-libtool:
--- kdm/Makefile.in
+++ kdm/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -277,6 +277,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20382,7 +24858,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -572,7 +575,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20391,7 +24867,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -610,9 +613,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20405,7 +24881,7 @@
mostlyclean-libtool:
--- kdmlib/Makefile.in
+++ kdmlib/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -306,6 +306,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20415,7 +24891,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -617,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20424,7 +24900,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -655,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20438,7 +24914,7 @@
@$(NORMAL_INSTALL)
--- kfind/Makefile.in
+++ kfind/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -338,6 +338,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20448,7 +24924,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -637,7 +640,7 @@
+@@ -653,7 +656,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20457,7 +24933,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -675,9 +678,9 @@
+@@ -691,9 +694,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20469,52 +24945,35 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1171,18 +1174,18 @@
- mocs: kfindpart.moc
+@@ -1246,8 +1249,6 @@
- #>+ 3
--kquery.moc: $(srcdir)/kquery.h
-- $(MOC) $(srcdir)/kquery.h -o kquery.moc
-+kdatecombo.moc: $(srcdir)/kdatecombo.h
-+ $(MOC) $(srcdir)/kdatecombo.h -o kdatecombo.moc
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+@@ -1256,13 +1257,15 @@
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfind.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
- #>+ 2
--mocs: kquery.moc
-+mocs: kdatecombo.moc
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfind.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfind.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
- #>+ 3
--kdatecombo.moc: $(srcdir)/kdatecombo.h
-- $(MOC) $(srcdir)/kdatecombo.h -o kdatecombo.moc
-+kquery.moc: $(srcdir)/kquery.h
-+ $(MOC) $(srcdir)/kquery.h -o kquery.moc
-
- #>+ 2
--mocs: kdatecombo.moc
-+mocs: kquery.moc
-
- #>+ 3
- kfinddlg.moc: $(srcdir)/kfinddlg.h
-@@ -1216,7 +1219,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kfwin.moc kfindpart.moc kquery.moc kdatecombo.moc kfinddlg.moc kftabdlg.moc kfind.moc
-+ -rm -f kfwin.moc kfindpart.moc kdatecombo.moc kquery.moc kfinddlg.moc kftabdlg.moc kfind.moc
-
- #>+ 2
- KDE_DIST=Kfind.desktop kfindpart.kdevprj kfindpart.h Makefile.in kfinddlg.h findpart.desktop cr32-app-kfind.png cr16-app-kfind.png cr64-app-kfind.png kfwin.h cr48-app-kfind.png kfindpart.desktop kfindpart.kdevses Makefile.am
-@@ -1284,7 +1287,7 @@
-
-
- #>+ 11
--libkfind_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kftabdlg.cpp $(srcdir)/kfind.cpp $(srcdir)/kquery.cpp $(srcdir)/kdatecombo.cpp kdatecombo.moc kquery.moc kfind.moc kftabdlg.moc
-+libkfind_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kftabdlg.cpp $(srcdir)/kfind.cpp $(srcdir)/kquery.cpp $(srcdir)/kdatecombo.cpp kquery.moc kdatecombo.moc kfind.moc kftabdlg.moc
- @echo 'creating libkfind_common_la.all_cpp.cpp ...'; \
- rm -f libkfind_common_la.all_cpp.files libkfind_common_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkfind_common_la.all_cpp.final; \
+ #>+ 15
+ force-reedit:
--- kfind/pics/Makefile.in
+++ kfind/pics/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20524,7 +24983,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20533,7 +24992,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20545,7 +25004,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -716,22 +719,22 @@
+@@ -732,22 +735,22 @@
#>+ 19
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions
@@ -20580,7 +25039,7 @@
force-reedit:
--- khelpcenter/htmlsearch/Makefile.in
+++ khelpcenter/htmlsearch/Makefile.in
-@@ -315,6 +315,9 @@
+@@ -329,6 +329,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20590,7 +25049,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -629,7 +632,7 @@
+@@ -645,7 +648,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20599,7 +25058,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -667,9 +670,9 @@
+@@ -683,9 +686,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20613,7 +25072,7 @@
@$(NORMAL_INSTALL)
--- khelpcenter/Makefile.in
+++ khelpcenter/Makefile.in
-@@ -336,6 +336,9 @@
+@@ -350,6 +350,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20623,7 +25082,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -676,7 +679,7 @@
+@@ -692,7 +695,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20632,7 +25091,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -714,9 +717,9 @@
+@@ -730,9 +733,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20644,7 +25103,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1289,11 +1292,11 @@
+@@ -1305,11 +1308,11 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmhelpcenter.kidl
#>+ 3
@@ -20659,7 +25118,7 @@
#>+ 3
navigator.moc: $(srcdir)/navigator.h
-@@ -1303,11 +1306,11 @@
+@@ -1319,11 +1322,11 @@
mocs: navigator.moc
#>+ 3
@@ -20674,7 +25133,7 @@
#>+ 3
fontdialog.moc: $(srcdir)/fontdialog.h
-@@ -1418,10 +1421,10 @@
+@@ -1434,10 +1437,10 @@
#>+ 3
clean-metasources:
@@ -20682,12 +25141,12 @@
+ -rm -f history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc glossary.moc treebuilder.moc infotree.moc htmlsearchconfig.moc mainwindow.moc searchhandler.moc kcmhelpcenter.moc view.moc htmlsearch.moc toc.moc searchwidget.moc khc_indexbuilder.moc searchengine.moc
#>+ 2
--KDE_DIST=fontdialog.h glossary.xslt kcmhelpcenter.desktop khc_indexbuilder.h navigator.h DESIGN docentrytraverser.h glossary.html.in htmlsearchconfig.h htmlsearch.h plugintraverser.h view.h Makefile.in searchhandler.h scrollkeepertreebuilder.h scopeitem.h mainwindow.h glossary.h treebuilder.h khelpcenterui.rc docentry.h searchengine.h navigatorappitem.h history.h table-of-contents.xslt application.h formatter.h prefs.kcfgc README.metadata khelpcenter.kcfg docmetainfo.h index.html.in Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am
-+KDE_DIST=fontdialog.h glossary.xslt kcmhelpcenter.desktop khc_indexbuilder.h navigator.h DESIGN docentrytraverser.h glossary.html.in htmlsearchconfig.h htmlsearch.h plugintraverser.h view.h Makefile.in searchhandler.h scrollkeepertreebuilder.h scopeitem.h mainwindow.h glossary.h treebuilder.h khelpcenterui.rc docentry.h searchengine.h navigatorappitem.h history.h table-of-contents.xslt formatter.h application.h prefs.kcfgc README.metadata khelpcenter.kcfg docmetainfo.h index.html.in Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am
+-KDE_DIST=fontdialog.h glossary.xslt kcmhelpcenter.desktop khc_indexbuilder.h navigator.h DESIGN docentrytraverser.h glossary.html.in htmlsearchconfig.h htmlsearch.h plugintraverser.h view.h Makefile.in searchhandler.h scrollkeepertreebuilder.h scopeitem.h mainwindow.h glossary.h treebuilder.h khelpcenterui.rc docentry.h configure.in.in searchengine.h navigatorappitem.h history.h table-of-contents.xslt application.h formatter.h prefs.kcfgc README.metadata khelpcenter.kcfg docmetainfo.h index.html.in Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am
++KDE_DIST=fontdialog.h glossary.xslt kcmhelpcenter.desktop khc_indexbuilder.h navigator.h DESIGN docentrytraverser.h glossary.html.in htmlsearchconfig.h htmlsearch.h plugintraverser.h view.h Makefile.in searchhandler.h scrollkeepertreebuilder.h scopeitem.h mainwindow.h glossary.h treebuilder.h khelpcenterui.rc docentry.h configure.in.in searchengine.h navigatorappitem.h history.h table-of-contents.xslt formatter.h application.h prefs.kcfgc README.metadata khelpcenter.kcfg docmetainfo.h index.html.in Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am
#>+ 6
clean-idl:
-@@ -1481,7 +1484,7 @@
+@@ -1497,7 +1500,7 @@
#>+ 11
@@ -20698,7 +25157,7 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_khelpcenter_la.all_cpp.final; \
--- khelpcenter/pics/Makefile.in
+++ khelpcenter/pics/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20708,7 +25167,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -542,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20717,7 +25176,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20729,51 +25188,48 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -716,29 +719,29 @@
+@@ -732,29 +735,29 @@
#>+ 25
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/khelpcenter.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/khelpcenter.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/khelpcenter.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/khelpcenter.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/khelpcenter.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/khelpcenter.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/khelpcenter.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/khelpcenter.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/khelpcenter.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/khelpcenter.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/khelpcenter.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khelpcenter.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khelpcenter.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/khelpcenter.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/khelpcenter.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/khelpcenter.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/khelpcenter.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/khelpcenter.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/khelpcenter.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/khelpcenter.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/khelpcenter.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/khelpcenter.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/khelpcenter.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/khelpcenter.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khelpcenter.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khelpcenter.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
#>+ 15
force-reedit:
--- khelpcenter/plugins/Applications/Makefile.in
+++ khelpcenter/plugins/Applications/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20783,7 +25239,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20792,7 +25248,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20806,7 +25262,7 @@
mostlyclean-libtool:
--- khelpcenter/plugins/Makefile.in
+++ khelpcenter/plugins/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20816,7 +25272,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -572,7 +575,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20825,7 +25281,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -610,9 +613,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20839,7 +25295,7 @@
mostlyclean-libtool:
--- khelpcenter/plugins/Manpages/Makefile.in
+++ khelpcenter/plugins/Manpages/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20849,7 +25305,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -553,7 +556,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20858,7 +25314,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -591,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20872,7 +25328,7 @@
mostlyclean-libtool:
--- khelpcenter/plugins/Scrollkeeper/Makefile.in
+++ khelpcenter/plugins/Scrollkeeper/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20882,7 +25338,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20891,7 +25347,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20905,7 +25361,7 @@
mostlyclean-libtool:
--- khelpcenter/plugins/Tutorials/Makefile.in
+++ khelpcenter/plugins/Tutorials/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20915,7 +25371,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20924,7 +25380,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20938,7 +25394,7 @@
mostlyclean-libtool:
--- khelpcenter/searchhandlers/Makefile.in
+++ khelpcenter/searchhandlers/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20948,7 +25404,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -562,7 +565,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20957,7 +25413,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -600,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20967,11 +25423,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_binSCRIPTS: $(kde_bin_SCRIPTS)
- @$(NORMAL_INSTALL)
+ khc_docbookdig.pl: $(top_builddir)/config.status $(srcdir)/khc_docbookdig.pl.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--- khotkeys/app/Makefile.in
+++ khotkeys/app/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -325,6 +325,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20981,7 +25437,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -624,7 +627,7 @@
+@@ -640,7 +643,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20990,7 +25446,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +665,9 @@
+@@ -678,9 +681,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21004,7 +25460,7 @@
@$(NORMAL_INSTALL)
--- khotkeys/data/Makefile.in
+++ khotkeys/data/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21014,7 +25470,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21023,7 +25479,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21037,7 +25493,7 @@
mostlyclean-libtool:
--- khotkeys/kcontrol/Makefile.in
+++ khotkeys/kcontrol/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -340,6 +340,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21047,7 +25503,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -633,7 +636,7 @@
+@@ -665,7 +668,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21056,7 +25512,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -671,9 +674,9 @@
+@@ -703,9 +706,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21068,32 +25524,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1111,18 +1114,18 @@
+@@ -1159,13 +1162,6 @@
mocs: gestures_settings_tab.moc
#>+ 3
-action_group_tab.moc: $(srcdir)/action_group_tab.h
- $(MOC) $(srcdir)/action_group_tab.h -o action_group_tab.moc
-+gesture_triggers_tab.moc: $(srcdir)/gesture_triggers_tab.h
-+ $(MOC) $(srcdir)/gesture_triggers_tab.h -o gesture_triggers_tab.moc
-
- #>+ 2
+-
+-#>+ 2
-mocs: action_group_tab.moc
-+mocs: gesture_triggers_tab.moc
+-
+-#>+ 3
+ gesture_triggers_tab.moc: $(srcdir)/gesture_triggers_tab.h
+ $(MOC) $(srcdir)/gesture_triggers_tab.h -o gesture_triggers_tab.moc
+@@ -1173,11 +1169,11 @@
+ mocs: gesture_triggers_tab.moc
+
#>+ 3
--gesture_triggers_tab.moc: $(srcdir)/gesture_triggers_tab.h
-- $(MOC) $(srcdir)/gesture_triggers_tab.h -o gesture_triggers_tab.moc
+-kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
+- $(MOC) $(srcdir)/kcmkhotkeys.h -o kcmkhotkeys.moc
+action_group_tab.moc: $(srcdir)/action_group_tab.h
+ $(MOC) $(srcdir)/action_group_tab.h -o action_group_tab.moc
#>+ 2
--mocs: gesture_triggers_tab.moc
+-mocs: kcmkhotkeys.moc
+mocs: action_group_tab.moc
#>+ 3
- kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
-@@ -1167,6 +1170,13 @@
+ voicerecorder.moc: $(srcdir)/voicerecorder.h
+@@ -1187,6 +1183,13 @@
+ mocs: voicerecorder.moc
+
+ #>+ 3
++kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
++ $(MOC) $(srcdir)/kcmkhotkeys.h -o kcmkhotkeys.moc
++
++#>+ 2
++mocs: kcmkhotkeys.moc
++
++#>+ 3
+ tab_widget.moc: $(srcdir)/tab_widget.h
+ $(MOC) $(srcdir)/tab_widget.h -o tab_widget.moc
+
+@@ -1222,6 +1225,13 @@
mocs: action_list_widget.moc
#>+ 3
@@ -21107,7 +25581,7 @@
main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
-@@ -1181,13 +1191,6 @@
+@@ -1236,13 +1246,6 @@
mocs: menuentry_widget.moc
#>+ 3
@@ -21121,44 +25595,44 @@
general_tab.moc: $(srcdir)/general_tab.h
$(MOC) $(srcdir)/general_tab.h -o general_tab.moc
-@@ -1209,13 +1212,6 @@
+@@ -1271,6 +1274,13 @@
mocs: gesturerecordpage.moc
#>+ 3
--command_url_widget.moc: $(srcdir)/command_url_widget.h
-- $(MOC) $(srcdir)/command_url_widget.h -o command_url_widget.moc
++triggers_tab.moc: $(srcdir)/triggers_tab.h
++ $(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
++
++#>+ 2
++mocs: triggers_tab.moc
++
++#>+ 3
+ windowselector.moc: $(srcdir)/windowselector.h
+ $(MOC) $(srcdir)/windowselector.h -o windowselector.moc
+
+@@ -1285,13 +1295,6 @@
+ mocs: command_url_widget.moc
+
+ #>+ 3
+-triggers_tab.moc: $(srcdir)/triggers_tab.h
+- $(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
-
-#>+ 2
--mocs: command_url_widget.moc
+-mocs: triggers_tab.moc
-
-#>+ 3
- triggers_tab.moc: $(srcdir)/triggers_tab.h
- $(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
-
-@@ -1230,6 +1226,13 @@
- mocs: windowselector.moc
-
- #>+ 3
-+command_url_widget.moc: $(srcdir)/command_url_widget.h
-+ $(MOC) $(srcdir)/command_url_widget.h -o command_url_widget.moc
-+
-+#>+ 2
-+mocs: command_url_widget.moc
-+
-+#>+ 3
keyboard_input_widget.moc: $(srcdir)/keyboard_input_widget.h
$(MOC) $(srcdir)/keyboard_input_widget.h -o keyboard_input_widget.moc
-@@ -1259,7 +1262,7 @@
+@@ -1330,7 +1333,7 @@
#>+ 3
clean-metasources:
-- -rm -f gesturedrawer.moc windowdef_simple_widget.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc actions_listview_widget.moc action_list_widget.moc main_buttons_widget.moc menuentry_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc command_url_widget.moc triggers_tab.moc windowselector.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
-+ -rm -f gesturedrawer.moc windowdef_simple_widget.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc kcmkhotkeys.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc actions_listview_widget.moc action_list_widget.moc gesturerecorder.moc main_buttons_widget.moc menuentry_widget.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc triggers_tab.moc windowselector.moc command_url_widget.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
+- -rm -f gesturedrawer.moc windowdef_simple_widget.moc voicerecordpage.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc voicerecorder.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc actions_listview_widget.moc action_list_widget.moc main_buttons_widget.moc menuentry_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc voice_settings_tab.moc gesturerecordpage.moc windowselector.moc command_url_widget.moc triggers_tab.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
++ -rm -f gesturedrawer.moc windowdef_simple_widget.moc voicerecordpage.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc voicerecorder.moc kcmkhotkeys.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc actions_listview_widget.moc action_list_widget.moc gesturerecorder.moc main_buttons_widget.moc menuentry_widget.moc general_tab.moc window_trigger_widget.moc voice_settings_tab.moc gesturerecordpage.moc triggers_tab.moc windowselector.moc command_url_widget.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
#>+ 2
KDE_DIST=hi32-app-khotkeys.png Makefile.in khotkeys.desktop hi16-app-khotkeys.png Makefile.am
-@@ -1273,14 +1276,14 @@
+@@ -1344,14 +1347,14 @@
#>+ 10
install-kde-icons:
@@ -21176,18 +25650,18 @@
#>+ 15
force-reedit:
-@@ -1321,7 +1324,7 @@
+@@ -1392,7 +1395,7 @@
#>+ 11
--kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp windowdef_simple_widget.moc gesturedrawer.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc kcmkhotkeys.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc action_list_widget.moc actions_listview_widget.moc gesturerecorder.moc menuentry_widget.moc main_buttons_widget.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc windowselector.moc triggers_tab.moc command_url_widget.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
-+kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp windowdef_simple_widget.moc gesturedrawer.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc action_list_widget.moc actions_listview_widget.moc menuentry_widget.moc main_buttons_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc command_url_widget.moc windowselector.moc triggers_tab.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
+-kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp $(srcdir)/voicerecorder.cpp $(srcdir)/voicerecordpage.cpp $(srcdir)/voice_settings_tab.cpp windowdef_simple_widget.moc gesturedrawer.moc voicerecordpage.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc voicerecorder.moc kcmkhotkeys.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc action_list_widget.moc actions_listview_widget.moc gesturerecorder.moc menuentry_widget.moc main_buttons_widget.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc voice_settings_tab.moc triggers_tab.moc command_url_widget.moc windowselector.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
++kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp $(srcdir)/voicerecorder.cpp $(srcdir)/voicerecordpage.cpp $(srcdir)/voice_settings_tab.cpp windowdef_simple_widget.moc gesturedrawer.moc voicerecordpage.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc voicerecorder.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc action_list_widget.moc actions_listview_widget.moc menuentry_widget.moc main_buttons_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc voice_settings_tab.moc command_url_widget.moc windowselector.moc triggers_tab.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
@echo 'creating kcm_khotkeys_la.all_cpp.cpp ...'; \
rm -f kcm_khotkeys_la.all_cpp.files kcm_khotkeys_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_khotkeys_la.all_cpp.final; \
--- khotkeys/kcontrol/ui/Makefile.in
+++ khotkeys/kcontrol/ui/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21197,7 +25671,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21206,7 +25680,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21218,18 +25692,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -852,7 +855,7 @@
+@@ -870,7 +873,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui Makefile.in dcop_widget_ui.ui menuentry_widget_ui.ui action_list_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am
-+KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui dcop_widget_ui.ui Makefile.in menuentry_widget_ui.ui action_list_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am
+-KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui Makefile.in dcop_widget_ui.ui menuentry_widget_ui.ui action_list_widget_ui.ui voice_input_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui voice_settings_tab_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am
++KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui dcop_widget_ui.ui Makefile.in menuentry_widget_ui.ui action_list_widget_ui.ui voice_input_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui voice_settings_tab_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am
- #>+ 21
+ #>+ 23
clean-ui:
--- khotkeys/Makefile.in
+++ khotkeys/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -277,6 +277,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21239,7 +25713,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -570,7 +573,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21248,7 +25722,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -608,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21262,7 +25736,7 @@
mostlyclean-libtool:
--- khotkeys/shared/Makefile.in
+++ khotkeys/shared/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -309,6 +309,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21272,7 +25746,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -621,7 +624,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21281,7 +25755,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -659,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21291,50 +25765,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
-@@ -906,22 +909,22 @@
- mocs: khlistview.moc
-
- #>+ 3
--triggers.moc: $(srcdir)/triggers.h
-- $(MOC) $(srcdir)/triggers.h -o triggers.moc
-+conditions.moc: $(srcdir)/conditions.h
-+ $(MOC) $(srcdir)/conditions.h -o conditions.moc
-
- #>+ 2
--mocs: triggers.moc
-+mocs: conditions.moc
-
- #>+ 3
--conditions.moc: $(srcdir)/conditions.h
-- $(MOC) $(srcdir)/conditions.h -o conditions.moc
-+triggers.moc: $(srcdir)/triggers.h
-+ $(MOC) $(srcdir)/triggers.h -o triggers.moc
-
- #>+ 2
--mocs: conditions.moc
-+mocs: triggers.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f gestures.moc khlistbox.moc input.moc windows.moc khlistview.moc triggers.moc conditions.moc
-+ -rm -f gestures.moc khlistbox.moc input.moc windows.moc khlistview.moc conditions.moc triggers.moc
-
- #>+ 2
- KDE_DIST=Makefile.in Makefile.am
-@@ -972,7 +975,7 @@
-
-
- #>+ 11
--libshared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/action_data.cpp $(srcdir)/khotkeysglobal.cpp $(srcdir)/triggers.cpp $(srcdir)/windows.cpp $(srcdir)/settings.cpp $(srcdir)/actions.cpp $(srcdir)/input.cpp $(srcdir)/conditions.cpp $(srcdir)/khlistview.cpp $(srcdir)/khlistbox.cpp $(srcdir)/gestures.cpp gestures.moc khlistbox.moc input.moc windows.moc khlistview.moc conditions.moc triggers.moc
-+libshared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/action_data.cpp $(srcdir)/khotkeysglobal.cpp $(srcdir)/triggers.cpp $(srcdir)/windows.cpp $(srcdir)/settings.cpp $(srcdir)/actions.cpp $(srcdir)/input.cpp $(srcdir)/conditions.cpp $(srcdir)/khlistview.cpp $(srcdir)/khlistbox.cpp $(srcdir)/gestures.cpp gestures.moc khlistbox.moc input.moc windows.moc khlistview.moc triggers.moc conditions.moc
- @echo 'creating libshared_la.all_cpp.cpp ...'; \
- rm -f libshared_la.all_cpp.files libshared_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libshared_la.all_cpp.final; \
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- khotkeys/update/Makefile.in
+++ khotkeys/update/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21344,7 +25779,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -565,7 +568,7 @@
+@@ -581,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21353,7 +25788,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -603,9 +606,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21367,7 +25802,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/clock/Makefile.in
+++ kicker/applets/clock/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21377,7 +25812,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21386,7 +25821,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21400,7 +25835,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/launcher/Makefile.in
+++ kicker/applets/launcher/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21410,7 +25845,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -616,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21419,7 +25854,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -654,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21433,7 +25868,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/lockout/Makefile.in
+++ kicker/applets/lockout/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21443,7 +25878,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -595,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21452,7 +25887,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -633,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21466,7 +25901,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/Makefile.in
+++ kicker/applets/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21476,7 +25911,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21485,7 +25920,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21499,7 +25934,7 @@
mostlyclean-libtool:
--- kicker/applets/media/Makefile.in
+++ kicker/applets/media/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21509,7 +25944,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -602,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21518,7 +25953,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -640,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21532,7 +25967,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/menu/Makefile.in
+++ kicker/applets/menu/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21542,7 +25977,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -600,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21551,7 +25986,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -638,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21565,7 +26000,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/minipager/Makefile.in
+++ kicker/applets/minipager/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21575,7 +26010,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -608,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21584,7 +26019,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -646,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21598,7 +26033,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/naughty/Makefile.in
+++ kicker/applets/naughty/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -303,6 +303,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21608,7 +26043,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -613,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21617,7 +26052,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -651,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21631,7 +26066,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/run/Makefile.in
+++ kicker/applets/run/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21641,7 +26076,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21650,7 +26085,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21664,7 +26099,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/swallow/Makefile.in
+++ kicker/applets/swallow/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21674,7 +26109,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21683,7 +26118,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21695,7 +26130,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -915,22 +918,22 @@
+@@ -931,22 +934,22 @@
#>+ 3
@@ -21725,7 +26160,7 @@
#>+ 2
KDE_DIST=swallowapplet.desktop Makefile.in prefwidgetbase.ui Makefile.am
-@@ -986,7 +989,7 @@
+@@ -1002,7 +1005,7 @@
#>+ 11
@@ -21734,7 +26169,7 @@
@echo 'creating swallow_panelapplet_la.all_cpp.cpp ...'; \
rm -f swallow_panelapplet_la.all_cpp.files swallow_panelapplet_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> swallow_panelapplet_la.all_cpp.final; \
-@@ -1030,8 +1033,8 @@
+@@ -1042,8 +1045,8 @@
swallow.o: swallow.moc
$(srcdir)/prefwidget.cpp: prefwidgetbase.h
nmcheck-am: nmcheck
@@ -21746,7 +26181,7 @@
--- kicker/applets/systemtray/Makefile.in
+++ kicker/applets/systemtray/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21756,7 +26191,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21765,7 +26200,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21779,7 +26214,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/taskbar/Makefile.in
+++ kicker/applets/taskbar/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21789,7 +26224,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21798,7 +26233,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21812,7 +26247,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/trash/Makefile.in
+++ kicker/applets/trash/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21822,7 +26257,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -602,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21831,7 +26266,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -640,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21843,226 +26278,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kicker/buttons/Makefile.in
-+++ kicker/buttons/Makefile.in
-@@ -278,6 +278,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -615,9 +618,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
-@@ -904,11 +907,11 @@
- mocs: servicebutton.moc
-
- #>+ 3
--kbutton.moc: $(srcdir)/kbutton.h
-- $(MOC) $(srcdir)/kbutton.h -o kbutton.moc
-+desktopbutton.moc: $(srcdir)/desktopbutton.h
-+ $(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
-
- #>+ 2
--mocs: kbutton.moc
-+mocs: desktopbutton.moc
-
- #>+ 3
- servicemenubutton.moc: $(srcdir)/servicemenubutton.h
-@@ -918,11 +921,11 @@
- mocs: servicemenubutton.moc
-
- #>+ 3
--desktopbutton.moc: $(srcdir)/desktopbutton.h
-- $(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
-+kbutton.moc: $(srcdir)/kbutton.h
-+ $(MOC) $(srcdir)/kbutton.h -o kbutton.moc
-
- #>+ 2
--mocs: desktopbutton.moc
-+mocs: kbutton.moc
-
- #>+ 3
- nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
-@@ -940,7 +943,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc kbutton.moc servicemenubutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
-+ -rm -f browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
-
- #>+ 2
- KDE_DIST=servicemenubutton.h servicebutton.h windowlistbutton.h Makefile.in desktopbutton.h urlbutton.h nonkdeappbutton.h bookmarksbutton.h extensionbutton.h browserbutton.h kbutton.h Makefile.am
-@@ -987,7 +990,7 @@
-
-
- #>+ 11
--libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp ../share/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp ../share/kickerSettings.h $(srcdir)/desktopbutton.cpp ../share/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp ../share/kickerSettings.h $(srcdir)/windowlistbutton.cpp browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
-+libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp ../share/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp ../share/kickerSettings.h $(srcdir)/desktopbutton.cpp ../share/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp ../share/kickerSettings.h $(srcdir)/windowlistbutton.cpp browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc kbutton.moc servicemenubutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
- @echo 'creating libkicker_buttons_la.all_cpp.cpp ...'; \
- rm -f libkicker_buttons_la.all_cpp.files libkicker_buttons_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkicker_buttons_la.all_cpp.final; \
-@@ -1030,8 +1033,8 @@
- extensionbutton.o: extensionbutton.moc
- urlbutton.o: urlbutton.moc
- nonkdeappbutton.lo: nonkdeappbutton.moc
--desktopbutton.o: desktopbutton.moc
- servicemenubutton.lo: servicemenubutton.moc
-+desktopbutton.o: desktopbutton.moc
- extensionbutton.lo: extensionbutton.moc
- bookmarksbutton.lo: bookmarksbutton.moc
- kbutton.o: kbutton.moc
---- kicker/core/Makefile.in
-+++ kicker/core/Makefile.in
-@@ -293,6 +293,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -649,9 +652,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
-@@ -966,18 +969,18 @@
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub panelextension.kidl
-
- #>+ 3
--container_extension.moc: $(srcdir)/container_extension.h
-- $(MOC) $(srcdir)/container_extension.h -o container_extension.moc
-+container_base.moc: $(srcdir)/container_base.h
-+ $(MOC) $(srcdir)/container_base.h -o container_base.moc
-
- #>+ 2
--mocs: container_extension.moc
-+mocs: container_base.moc
-
- #>+ 3
--container_base.moc: $(srcdir)/container_base.h
-- $(MOC) $(srcdir)/container_base.h -o container_base.moc
-+container_extension.moc: $(srcdir)/container_extension.h
-+ $(MOC) $(srcdir)/container_extension.h -o container_extension.moc
-
- #>+ 2
--mocs: container_base.moc
-+mocs: container_extension.moc
-
- #>+ 3
- container_applet.moc: $(srcdir)/container_applet.h
-@@ -1015,18 +1018,18 @@
- mocs: pluginmanager.moc
-
- #>+ 3
--container_button.moc: $(srcdir)/container_button.h
-- $(MOC) $(srcdir)/container_button.h -o container_button.moc
-+unhidetrigger.moc: $(srcdir)/unhidetrigger.h
-+ $(MOC) $(srcdir)/unhidetrigger.h -o unhidetrigger.moc
-
- #>+ 2
--mocs: container_button.moc
-+mocs: unhidetrigger.moc
-
- #>+ 3
--unhidetrigger.moc: $(srcdir)/unhidetrigger.h
-- $(MOC) $(srcdir)/unhidetrigger.h -o unhidetrigger.moc
-+container_button.moc: $(srcdir)/container_button.h
-+ $(MOC) $(srcdir)/container_button.h -o container_button.moc
-
- #>+ 2
--mocs: unhidetrigger.moc
-+mocs: container_button.moc
-
- #>+ 3
- showdesktop.moc: $(srcdir)/showdesktop.h
-@@ -1043,18 +1046,18 @@
- mocs: extensionmanager.moc
-
- #>+ 3
--kicker.moc: $(srcdir)/kicker.h
-- $(MOC) $(srcdir)/kicker.h -o kicker.moc
-+panelextension.moc: $(srcdir)/panelextension.h
-+ $(MOC) $(srcdir)/panelextension.h -o panelextension.moc
-
- #>+ 2
--mocs: kicker.moc
-+mocs: panelextension.moc
-
- #>+ 3
--panelextension.moc: $(srcdir)/panelextension.h
-- $(MOC) $(srcdir)/panelextension.h -o panelextension.moc
-+kicker.moc: $(srcdir)/kicker.h
-+ $(MOC) $(srcdir)/kicker.h -o kicker.moc
-
- #>+ 2
--mocs: panelextension.moc
-+mocs: kicker.moc
-
- #>+ 3
- userrectsel.moc: $(srcdir)/userrectsel.h
-@@ -1065,7 +1068,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f container_extension.moc container_base.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
-+ -rm -f container_base.moc container_extension.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
-
- #>+ 2
- KDE_DIST=extensionmanager.h kicker.h container_extension.h showdesktop.h paneldrag.h menumanager.h container_button.h Makefile.in panelextension.h default-apps extensionSettings.kcfgc childpanelextension.desktop unhidetrigger.h applethandle.h container_base.h extensionSettings.kcfg kickerbindings.cpp pluginmanager.h containerarea.h containerarealayout.h container_applet.h userrectsel.h Makefile.am
-@@ -1123,7 +1126,7 @@
-
-
- #>+ 11
--libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp ../share/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp ../share/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp ../share/kickerSettings.h $(srcdir)/container_extension.cpp ../share/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp ../share/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/paneldrag.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp container_base.moc container_extension.moc applethandle.moc container_applet.moc menumanager.moc containerarea.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
-+libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp ../share/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp ../share/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp ../share/kickerSettings.h $(srcdir)/container_extension.cpp ../share/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp ../share/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/paneldrag.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp container_extension.moc container_base.moc applethandle.moc container_applet.moc menumanager.moc containerarea.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
- @echo 'creating libkicker_core_la.all_cpp.cpp ...'; \
- rm -f libkicker_core_la.all_cpp.files libkicker_core_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkicker_core_la.all_cpp.final; \
--- kicker/data/app_start_anim/Makefile.in
+++ kicker/data/app_start_anim/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22072,7 +26290,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22081,7 +26299,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22095,7 +26313,7 @@
mostlyclean-libtool:
--- kicker/data/icons/actions/Makefile.in
+++ kicker/data/icons/actions/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22105,7 +26323,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22114,7 +26332,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22128,7 +26346,7 @@
mostlyclean-libtool:
--- kicker/data/icons/Makefile.in
+++ kicker/data/icons/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22138,7 +26356,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -557,7 +560,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22147,7 +26365,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -595,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22159,79 +26377,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -879,45 +882,45 @@
+@@ -895,27 +898,27 @@
- #>+ 41
+ #>+ 23
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmenu.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kmenu.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kmenu.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmenu.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
#>+ 15
force-reedit:
--- kicker/data/kmenu_side/Makefile.in
+++ kicker/data/kmenu_side/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22241,7 +26425,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22250,7 +26434,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22264,7 +26448,7 @@
mostlyclean-libtool:
--- kicker/data/Makefile.in
+++ kicker/data/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22274,7 +26458,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22283,7 +26467,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22297,7 +26481,7 @@
mostlyclean-libtool:
--- kicker/data/tiles/Makefile.in
+++ kicker/data/tiles/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22307,7 +26491,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -603,7 +606,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22316,7 +26500,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22328,7 +26512,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -787,7 +790,7 @@
+@@ -803,7 +806,7 @@
.NOEXPORT:
#>+ 2
@@ -22339,7 +26523,7 @@
docs-am:
--- kicker/data/wallpaper/Makefile.in
+++ kicker/data/wallpaper/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22349,7 +26533,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22358,7 +26542,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22372,7 +26556,7 @@
mostlyclean-libtool:
--- kicker/extensions/dockbar/Makefile.in
+++ kicker/extensions/dockbar/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22382,7 +26566,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22391,7 +26575,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22405,7 +26589,7 @@
@$(NORMAL_INSTALL)
--- kicker/extensions/kasbar/Makefile.in
+++ kicker/extensions/kasbar/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -322,6 +322,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22415,7 +26599,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -638,7 +641,7 @@
+@@ -652,7 +655,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22424,7 +26608,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -676,9 +679,9 @@
+@@ -690,9 +693,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22436,7 +26620,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1085,6 +1088,13 @@
+@@ -1099,6 +1102,13 @@
mocs: kasbarextension.moc
#>+ 3
@@ -22450,7 +26634,7 @@
kasclockitem.moc: $(srcdir)/kasclockitem.h
$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
-@@ -1099,13 +1109,6 @@
+@@ -1113,13 +1123,6 @@
mocs: kasitem.moc
#>+ 3
@@ -22464,7 +26648,7 @@
kasresources.moc: $(srcdir)/kasresources.h
$(MOC) $(srcdir)/kasresources.h -o kasresources.moc
-@@ -1165,7 +1168,7 @@
+@@ -1179,7 +1182,7 @@
#>+ 3
clean-metasources:
@@ -22473,18 +26657,9 @@
#>+ 2
KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile configure.in.in docs.h kastaskpopup.h kasbarextension.desktop Makefile.am
-@@ -1216,7 +1219,7 @@
-
-
- #>+ 11
--libkasbar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kasbar.cpp $(srcdir)/kasitem.cpp $(srcdir)/kastaskitem.cpp $(srcdir)/kastasker.cpp $(srcdir)/kaspopup.cpp $(srcdir)/kastaskpopup.cpp $(srcdir)/kasstartupitem.cpp $(srcdir)/kasaboutdlg.cpp $(srcdir)/kasprefsdlg.cpp $(srcdir)/kasclockitem.cpp $(srcdir)/kasgroupitem.cpp $(srcdir)/kasresources.cpp $(srcdir)/kasgrouper.cpp $(srcdir)/kasloaditem.cpp kasgroupitem.moc kastaskitem.moc kastasker.moc kasaboutdlg.moc kasitem.moc kasclockitem.moc kaspopup.moc kasresources.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
-+libkasbar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kasbar.cpp $(srcdir)/kasitem.cpp $(srcdir)/kastaskitem.cpp $(srcdir)/kastasker.cpp $(srcdir)/kaspopup.cpp $(srcdir)/kastaskpopup.cpp $(srcdir)/kasstartupitem.cpp $(srcdir)/kasaboutdlg.cpp $(srcdir)/kasprefsdlg.cpp $(srcdir)/kasclockitem.cpp $(srcdir)/kasgroupitem.cpp $(srcdir)/kasresources.cpp $(srcdir)/kasgrouper.cpp $(srcdir)/kasloaditem.cpp kasgroupitem.moc kastaskitem.moc kastasker.moc kasitem.moc kasclockitem.moc kasaboutdlg.moc kaspopup.moc kasresources.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
- @echo 'creating libkasbar_la.all_cpp.cpp ...'; \
- rm -f libkasbar_la.all_cpp.files libkasbar_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkasbar_la.all_cpp.final; \
--- kicker/extensions/Makefile.in
+++ kicker/extensions/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22494,7 +26669,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22503,7 +26678,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22517,7 +26692,7 @@
mostlyclean-libtool:
--- kicker/extensions/sidebar/Makefile.in
+++ kicker/extensions/sidebar/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22527,7 +26702,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22536,7 +26711,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22550,7 +26725,7 @@
@$(NORMAL_INSTALL)
--- kicker/extensions/taskbar/Makefile.in
+++ kicker/extensions/taskbar/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22560,7 +26735,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -608,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22569,7 +26744,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -646,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22581,9 +26756,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kicker/Makefile.in
-+++ kicker/Makefile.in
-@@ -332,6 +332,9 @@
+--- kicker/kicker/buttons/Makefile.in
++++ kicker/kicker/buttons/Makefile.in
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22593,7 +26768,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -644,7 +647,7 @@
+@@ -609,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22602,7 +26777,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -682,9 +685,9 @@
+@@ -647,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22612,11 +26787,471 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+@@ -957,11 +960,11 @@
+ mocs: servicebutton.moc
+
+ #>+ 3
+-kbutton.moc: $(srcdir)/kbutton.h
+- $(MOC) $(srcdir)/kbutton.h -o kbutton.moc
++desktopbutton.moc: $(srcdir)/desktopbutton.h
++ $(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
+
+ #>+ 2
+-mocs: kbutton.moc
++mocs: desktopbutton.moc
+
+ #>+ 3
+ servicemenubutton.moc: $(srcdir)/servicemenubutton.h
+@@ -971,11 +974,11 @@
+ mocs: servicemenubutton.moc
+
+ #>+ 3
+-desktopbutton.moc: $(srcdir)/desktopbutton.h
+- $(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
++kbutton.moc: $(srcdir)/kbutton.h
++ $(MOC) $(srcdir)/kbutton.h -o kbutton.moc
+
+ #>+ 2
+-mocs: desktopbutton.moc
++mocs: kbutton.moc
+
+ #>+ 3
+ nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
+@@ -993,10 +996,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc kbutton.moc servicemenubutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
++ -rm -f browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
+
+ #>+ 2
+-KDE_DIST=servicemenubutton.h servicebutton.h kmenu.desktop windowlistbutton.h Makefile.in desktopbutton.h urlbutton.h nonkdeappbutton.h bookmarks.desktop bookmarksbutton.h extensionbutton.h browserbutton.h desktop.desktop browser.desktop kbutton.h exec.desktop Makefile.am windowlist.desktop
++KDE_DIST=servicemenubutton.h servicebutton.h kmenu.desktop windowlistbutton.h Makefile.in desktopbutton.h urlbutton.h nonkdeappbutton.h bookmarks.desktop bookmarksbutton.h extensionbutton.h browserbutton.h desktop.desktop browser.desktop exec.desktop kbutton.h Makefile.am windowlist.desktop
+
+ #>+ 2
+ docs-am:
+@@ -1040,7 +1043,7 @@
+
+
+ #>+ 11
+-libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/desktopbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/windowlistbutton.cpp browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
++libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/desktopbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/windowlistbutton.cpp browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc kbutton.moc servicemenubutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
+ @echo 'creating libkicker_buttons_la.all_cpp.cpp ...'; \
+ rm -f libkicker_buttons_la.all_cpp.files libkicker_buttons_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkicker_buttons_la.all_cpp.final; \
+@@ -1079,8 +1082,8 @@
+ extensionbutton.o: extensionbutton.moc
+ urlbutton.o: urlbutton.moc
+ nonkdeappbutton.lo: nonkdeappbutton.moc
+-desktopbutton.o: desktopbutton.moc
+ servicemenubutton.lo: servicemenubutton.moc
++desktopbutton.o: desktopbutton.moc
+ extensionbutton.lo: extensionbutton.moc
+ bookmarksbutton.lo: bookmarksbutton.moc
+ kbutton.o: kbutton.moc
+--- kicker/kicker/core/Makefile.in
++++ kicker/kicker/core/Makefile.in
+@@ -307,6 +307,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -628,7 +631,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -666,9 +669,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+@@ -982,18 +985,18 @@
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub panelextension.kidl
+
+ #>+ 3
+-container_extension.moc: $(srcdir)/container_extension.h
+- $(MOC) $(srcdir)/container_extension.h -o container_extension.moc
++container_base.moc: $(srcdir)/container_base.h
++ $(MOC) $(srcdir)/container_base.h -o container_base.moc
+
+ #>+ 2
+-mocs: container_extension.moc
++mocs: container_base.moc
+
+ #>+ 3
+-container_base.moc: $(srcdir)/container_base.h
+- $(MOC) $(srcdir)/container_base.h -o container_base.moc
++container_extension.moc: $(srcdir)/container_extension.h
++ $(MOC) $(srcdir)/container_extension.h -o container_extension.moc
+
+ #>+ 2
+-mocs: container_base.moc
++mocs: container_extension.moc
+
+ #>+ 3
+ container_applet.moc: $(srcdir)/container_applet.h
+@@ -1031,18 +1034,18 @@
+ mocs: pluginmanager.moc
+
+ #>+ 3
+-container_button.moc: $(srcdir)/container_button.h
+- $(MOC) $(srcdir)/container_button.h -o container_button.moc
++unhidetrigger.moc: $(srcdir)/unhidetrigger.h
++ $(MOC) $(srcdir)/unhidetrigger.h -o unhidetrigger.moc
+
+ #>+ 2
+-mocs: container_button.moc
++mocs: unhidetrigger.moc
+
+ #>+ 3
+-unhidetrigger.moc: $(srcdir)/unhidetrigger.h
+- $(MOC) $(srcdir)/unhidetrigger.h -o unhidetrigger.moc
++container_button.moc: $(srcdir)/container_button.h
++ $(MOC) $(srcdir)/container_button.h -o container_button.moc
+
+ #>+ 2
+-mocs: unhidetrigger.moc
++mocs: container_button.moc
+
+ #>+ 3
+ showdesktop.moc: $(srcdir)/showdesktop.h
+@@ -1059,18 +1062,18 @@
+ mocs: extensionmanager.moc
+
+ #>+ 3
+-kicker.moc: $(srcdir)/kicker.h
+- $(MOC) $(srcdir)/kicker.h -o kicker.moc
++panelextension.moc: $(srcdir)/panelextension.h
++ $(MOC) $(srcdir)/panelextension.h -o panelextension.moc
+
+ #>+ 2
+-mocs: kicker.moc
++mocs: panelextension.moc
+
+ #>+ 3
+-panelextension.moc: $(srcdir)/panelextension.h
+- $(MOC) $(srcdir)/panelextension.h -o panelextension.moc
++kicker.moc: $(srcdir)/kicker.h
++ $(MOC) $(srcdir)/kicker.h -o kicker.moc
+
+ #>+ 2
+-mocs: panelextension.moc
++mocs: kicker.moc
+
+ #>+ 3
+ userrectsel.moc: $(srcdir)/userrectsel.h
+@@ -1081,7 +1084,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f container_extension.moc container_base.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
++ -rm -f container_base.moc container_extension.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
+
+ #>+ 2
+ KDE_DIST=extensionmanager.h kicker.h container_extension.h showdesktop.h menumanager.h container_button.h Makefile.in panelextension.h default-apps extensionSettings.kcfgc childpanelextension.desktop unhidetrigger.h applethandle.h container_base.h extensionSettings.kcfg kickerbindings.cpp pluginmanager.h containerarea.h containerarealayout.h container_applet.h userrectsel.h Makefile.am
+@@ -1139,7 +1142,7 @@
+
+
+ #>+ 11
+-libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp ../../libkicker/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp ../../libkicker/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp ../../libkicker/kickerSettings.h $(srcdir)/container_extension.cpp ../../libkicker/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp ../../libkicker/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp container_base.moc container_extension.moc applethandle.moc container_applet.moc menumanager.moc containerarea.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
++libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp ../../libkicker/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp ../../libkicker/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp ../../libkicker/kickerSettings.h $(srcdir)/container_extension.cpp ../../libkicker/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp ../../libkicker/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp container_extension.moc container_base.moc applethandle.moc container_applet.moc menumanager.moc containerarea.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
+ @echo 'creating libkicker_core_la.all_cpp.cpp ...'; \
+ rm -f libkicker_core_la.all_cpp.files libkicker_core_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkicker_core_la.all_cpp.final; \
+--- kicker/kicker/Makefile.in
++++ kicker/kicker/Makefile.in
+@@ -345,6 +345,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -659,7 +662,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -697,9 +700,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- kicker/kicker/ui/Makefile.in
++++ kicker/kicker/ui/Makefile.in
+@@ -301,6 +301,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -628,7 +631,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -666,9 +669,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+@@ -950,11 +953,11 @@
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub k_mnu.kidl
+
+ #>+ 3
+-appletwidget.moc: $(srcdir)/appletwidget.h
+- $(MOC) $(srcdir)/appletwidget.h -o appletwidget.moc
++addapplet.moc: $(srcdir)/addapplet.h
++ $(MOC) $(srcdir)/addapplet.h -o addapplet.moc
+
+ #>+ 2
+-mocs: appletwidget.moc
++mocs: addapplet.moc
+
+ #>+ 3
+ exe_dlg.moc: $(srcdir)/exe_dlg.h
+@@ -964,11 +967,11 @@
+ mocs: exe_dlg.moc
+
+ #>+ 3
+-addapplet.moc: $(srcdir)/addapplet.h
+- $(MOC) $(srcdir)/addapplet.h -o addapplet.moc
++appletwidget.moc: $(srcdir)/appletwidget.h
++ $(MOC) $(srcdir)/appletwidget.h -o appletwidget.moc
+
+ #>+ 2
+-mocs: addapplet.moc
++mocs: appletwidget.moc
+
+ #>+ 3
+ hidebutton.moc: $(srcdir)/hidebutton.h
+@@ -1062,18 +1065,18 @@
+ mocs: addappletvisualfeedback.moc
+
+ #>+ 3
+-client_mnu.moc: $(srcdir)/client_mnu.h
+- $(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
++quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
++ $(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
+
+ #>+ 2
+-mocs: client_mnu.moc
++mocs: quickbrowser_mnu.moc
+
+ #>+ 3
+-quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
+- $(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
++client_mnu.moc: $(srcdir)/client_mnu.h
++ $(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
+
+ #>+ 2
+-mocs: quickbrowser_mnu.moc
++mocs: client_mnu.moc
+
+ #>+ 3
+ addextension_mnu.moc: $(srcdir)/addextension_mnu.h
+@@ -1084,7 +1087,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f appletwidget.moc exe_dlg.moc addapplet.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc addappletvisualfeedback.moc client_mnu.moc quickbrowser_mnu.moc addextension_mnu.moc
++ -rm -f addapplet.moc exe_dlg.moc appletwidget.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc addappletvisualfeedback.moc quickbrowser_mnu.moc client_mnu.moc addextension_mnu.moc
+
+ #>+ 2
+ KDE_DIST=Makefile.in appletitem.ui nonKDEButtonSettings.ui panelmenuiteminfo.h appletview.ui Makefile.am
+@@ -1143,7 +1146,7 @@
+
+
+ #>+ 11
+-libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/browser_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/addextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/recentapps.cpp ../../libkicker/kickerSettings.h $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp ../core/extensionSettings.h $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp $(srcdir)/addappletvisualfeedback.cpp k_mnu_skel.cpp appletitem.cpp appletview.cpp nonKDEButtonSettings.cpp addapplet.moc exe_dlg.moc appletwidget.moc appletview.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc appletitem.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc removebutton_mnu.moc addbutton_mnu.moc quickbrowser_mnu.moc client_mnu.moc addappletvisualfeedback.moc addextension_mnu.moc
++libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/browser_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/addextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/recentapps.cpp ../../libkicker/kickerSettings.h $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp ../core/extensionSettings.h $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp $(srcdir)/addappletvisualfeedback.cpp k_mnu_skel.cpp appletitem.cpp appletview.cpp nonKDEButtonSettings.cpp appletwidget.moc exe_dlg.moc addapplet.moc appletview.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc appletitem.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc removebutton_mnu.moc addbutton_mnu.moc client_mnu.moc quickbrowser_mnu.moc addappletvisualfeedback.moc addextension_mnu.moc
+ @echo 'creating libkicker_ui_la.all_cpp.cpp ...'; \
+ rm -f libkicker_ui_la.all_cpp.files libkicker_ui_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkicker_ui_la.all_cpp.final; \
+@@ -1184,7 +1187,7 @@
+ addappletvisualfeedback.o: addappletvisualfeedback.moc
+ addextension_mnu.o: addextension_mnu.moc
+ browser_dlg.lo: browser_dlg.moc
+-addapplet.o: appletwidget.moc addapplet.moc
++addapplet.o: addapplet.moc appletwidget.moc
+ appletop_mnu.o: appletop_mnu.moc
+ $(srcdir)/extensionop_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
+ $(srcdir)/addappletvisualfeedback.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
+@@ -1194,7 +1197,7 @@
+ $(srcdir)/removecontainer_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
+ $(srcdir)/removeextension_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
+ addbutton_mnu.o: addbutton_mnu.moc
+-addapplet.lo: appletwidget.moc addapplet.moc
++addapplet.lo: addapplet.moc appletwidget.moc
+ nmcheck-am: nmcheck
+ $(srcdir)/browser_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
+ $(srcdir)/removeapplet_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
+--- kicker/libkicker/Makefile.in
++++ kicker/libkicker/Makefile.in
+@@ -299,6 +299,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -609,7 +612,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -647,9 +650,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -957,22 +960,22 @@
+ mocs: panelbutton.moc
+
+ #>+ 3
+-simplebutton.moc: $(srcdir)/simplebutton.h
+- $(MOC) $(srcdir)/simplebutton.h -o simplebutton.moc
++kickertip.moc: $(srcdir)/kickertip.h
++ $(MOC) $(srcdir)/kickertip.h -o kickertip.moc
+
+ #>+ 2
+-mocs: simplebutton.moc
++mocs: kickertip.moc
+
+ #>+ 3
+-kickertip.moc: $(srcdir)/kickertip.h
+- $(MOC) $(srcdir)/kickertip.h -o kickertip.moc
++simplebutton.moc: $(srcdir)/simplebutton.h
++ $(MOC) $(srcdir)/simplebutton.h -o simplebutton.moc
+
+ #>+ 2
+-mocs: kickertip.moc
++mocs: simplebutton.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f panner.moc panelbutton.moc simplebutton.moc kickertip.moc
++ -rm -f panner.moc panelbutton.moc kickertip.moc simplebutton.moc
+
+ #>+ 2
+ KDE_DIST=menuinfo.h paneldrag.h simplebutton.h global.h panelbutton.h Makefile.in kickerSettings.kcfgc kickertip.h kshadowengine.h panner.h kshadowsettings.h kickerSettings.kcfg appletinfo.h Makefile.am
+@@ -1028,7 +1031,7 @@
+
+
+ #>+ 11
+-libkickermain_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletinfo.cpp $(srcdir)/global.cpp $(srcdir)/kickertip.cpp $(srcdir)/menuinfo.cpp $(srcdir)/panelbutton.cpp $(srcdir)/panner.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kshadowengine.cpp $(srcdir)/paneldrag.cpp $(srcdir)/simplebutton.cpp kickerSettings.cpp panner.moc panelbutton.moc kickertip.moc simplebutton.moc
++libkickermain_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletinfo.cpp $(srcdir)/global.cpp $(srcdir)/kickertip.cpp $(srcdir)/menuinfo.cpp $(srcdir)/panelbutton.cpp $(srcdir)/panner.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kshadowengine.cpp $(srcdir)/paneldrag.cpp $(srcdir)/simplebutton.cpp kickerSettings.cpp panner.moc panelbutton.moc simplebutton.moc kickertip.moc
+ @echo 'creating libkickermain_la.all_cpp.cpp ...'; \
+ rm -f libkickermain_la.all_cpp.files libkickermain_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkickermain_la.all_cpp.final; \
+@@ -1082,8 +1085,8 @@
+ simplebutton.lo: simplebutton.moc
+ $(srcdir)/simplebutton.cpp: kickerSettings.h
+ $(srcdir)/paneldrag.cpp: kickerSettings.h
+-$(srcdir)/panelbutton.cpp: kickerSettings.h
+ panner.lo: panner.moc
++$(srcdir)/panelbutton.cpp: kickerSettings.h
+
+ #>+ 6
+ kickerSettings.cpp: kickerSettings.h
+--- kicker/Makefile.in
++++ kicker/Makefile.in
+@@ -267,6 +267,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -557,7 +560,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -595,9 +598,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- kicker/menuext/find/Makefile.in
+++ kicker/menuext/find/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22626,7 +27261,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22635,7 +27270,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22649,7 +27284,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/kdeprint/Makefile.in
+++ kicker/menuext/kdeprint/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22659,7 +27294,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22668,7 +27303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22682,7 +27317,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/konq-profiles/Makefile.in
+++ kicker/menuext/konq-profiles/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22692,7 +27327,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -593,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22701,7 +27336,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -631,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22715,7 +27350,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/konsole/Makefile.in
+++ kicker/menuext/konsole/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22725,7 +27360,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22734,7 +27369,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22748,7 +27383,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/Makefile.in
+++ kicker/menuext/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22758,7 +27393,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22767,7 +27402,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22781,7 +27416,7 @@
mostlyclean-libtool:
--- kicker/menuext/prefmenu/Makefile.in
+++ kicker/menuext/prefmenu/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22791,7 +27426,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22800,7 +27435,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22814,7 +27449,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/recentdocs/Makefile.in
+++ kicker/menuext/recentdocs/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22824,7 +27459,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22833,7 +27468,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22847,7 +27482,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/remote/Makefile.in
+++ kicker/menuext/remote/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22857,7 +27492,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -598,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22866,7 +27501,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22880,7 +27515,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/system/Makefile.in
+++ kicker/menuext/system/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22890,7 +27525,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22899,7 +27534,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22913,7 +27548,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/tom/Makefile.in
+++ kicker/menuext/tom/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22923,7 +27558,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -595,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22932,7 +27567,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -633,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22946,7 +27581,7 @@
@$(NORMAL_INSTALL)
--- kicker/proxy/Makefile.in
+++ kicker/proxy/Makefile.in
-@@ -313,6 +313,9 @@
+@@ -327,6 +327,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22956,7 +27591,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -620,7 +623,7 @@
+@@ -636,7 +639,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22965,7 +27600,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -658,9 +661,9 @@
+@@ -674,9 +677,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22977,7 +27612,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1044,18 +1047,18 @@
+@@ -1060,18 +1063,18 @@
extensionproxy_DEPENDENCIES = libkdeinit_extensionproxy.la
#>+ 3
@@ -23002,7 +27637,7 @@
#>+ 3
extensiondebugger.moc: $(srcdir)/extensiondebugger.h
-@@ -1066,7 +1069,7 @@
+@@ -1082,7 +1085,7 @@
#>+ 3
clean-metasources:
@@ -23011,9 +27646,9 @@
#>+ 2
KDE_DIST=Makefile.in appletproxy.h extensiondebugger.h extensionproxy.h Makefile.am
---- kicker/share/Makefile.in
-+++ kicker/share/Makefile.in
-@@ -280,6 +280,9 @@
+--- kicker/taskbar/Makefile.in
++++ kicker/taskbar/Makefile.in
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23023,7 +27658,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -605,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23032,7 +27667,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -643,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23044,9 +27679,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kicker/taskbar/Makefile.in
-+++ kicker/taskbar/Makefile.in
-@@ -285,6 +285,9 @@
+--- kicker/taskmanager/Makefile.in
++++ kicker/taskmanager/Makefile.in
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23056,7 +27691,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23065,7 +27700,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23077,9 +27712,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kicker/taskmanager/Makefile.in
-+++ kicker/taskmanager/Makefile.in
-@@ -280,6 +280,9 @@
+--- kioslave/about/Makefile.in
++++ kioslave/about/Makefile.in
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23089,7 +27724,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -598,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23098,7 +27733,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23108,11 +27743,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kicker/ui/Makefile.in
-+++ kicker/ui/Makefile.in
-@@ -287,6 +287,9 @@
+--- kioslave/cgi/kcmcgi/Makefile.in
++++ kioslave/cgi/kcmcgi/Makefile.in
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23122,7 +27757,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23131,7 +27766,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23141,84 +27776,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstLTLIBRARIES:
-@@ -991,11 +994,11 @@
- mocs: addapplet_mnu.moc
-
- #>+ 3
--browser_dlg.moc: $(srcdir)/browser_dlg.h
-- $(MOC) $(srcdir)/browser_dlg.h -o browser_dlg.moc
-+service_mnu.moc: $(srcdir)/service_mnu.h
-+ $(MOC) $(srcdir)/service_mnu.h -o service_mnu.moc
-
- #>+ 2
--mocs: browser_dlg.moc
-+mocs: service_mnu.moc
-
- #>+ 3
- addcontainer_mnu.moc: $(srcdir)/addcontainer_mnu.h
-@@ -1005,11 +1008,11 @@
- mocs: addcontainer_mnu.moc
-
- #>+ 3
--service_mnu.moc: $(srcdir)/service_mnu.h
-- $(MOC) $(srcdir)/service_mnu.h -o service_mnu.moc
-+browser_dlg.moc: $(srcdir)/browser_dlg.h
-+ $(MOC) $(srcdir)/browser_dlg.h -o browser_dlg.moc
-
- #>+ 2
--mocs: service_mnu.moc
-+mocs: browser_dlg.moc
-
- #>+ 3
- addbutton_mnu.moc: $(srcdir)/addbutton_mnu.h
-@@ -1026,18 +1029,18 @@
- mocs: removebutton_mnu.moc
-
- #>+ 3
--client_mnu.moc: $(srcdir)/client_mnu.h
-- $(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
-+quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
-+ $(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
-
- #>+ 2
--mocs: client_mnu.moc
-+mocs: quickbrowser_mnu.moc
-
- #>+ 3
--quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
-- $(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
-+client_mnu.moc: $(srcdir)/client_mnu.h
-+ $(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
-
- #>+ 2
--mocs: quickbrowser_mnu.moc
-+mocs: client_mnu.moc
-
- #>+ 3
- removespecialbutton_mnu.moc: $(srcdir)/removespecialbutton_mnu.h
-@@ -1055,7 +1058,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f exe_dlg.moc addspecialbutton_mnu.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc addcontainer_mnu.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc client_mnu.moc quickbrowser_mnu.moc removespecialbutton_mnu.moc addextension_mnu.moc
-+ -rm -f exe_dlg.moc addspecialbutton_mnu.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc service_mnu.moc addcontainer_mnu.moc browser_dlg.moc addbutton_mnu.moc removebutton_mnu.moc quickbrowser_mnu.moc client_mnu.moc removespecialbutton_mnu.moc addextension_mnu.moc
-
- #>+ 2
- KDE_DIST=Makefile.in nonKDEButtonSettings.ui panelmenuiteminfo.h Makefile.am
-@@ -1107,7 +1110,7 @@
-
-
- #>+ 11
--libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp ../share/kickerSettings.h $(srcdir)/browser_mnu.cpp $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp ../share/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp ../share/kickerSettings.h $(srcdir)/addextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp ../share/kickerSettings.h $(srcdir)/addcontainer_mnu.cpp $(srcdir)/recentapps.cpp $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp ../core/extensionSettings.h $(srcdir)/addspecialbutton_mnu.cpp $(srcdir)/removespecialbutton_mnu.cpp $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp nonKDEButtonSettings.cpp exe_dlg.moc addspecialbutton_mnu.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc addcontainer_mnu.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc quickbrowser_mnu.moc client_mnu.moc removespecialbutton_mnu.moc addextension_mnu.moc
-+libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp ../share/kickerSettings.h $(srcdir)/browser_mnu.cpp $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp ../share/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp ../share/kickerSettings.h $(srcdir)/addextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp ../share/kickerSettings.h $(srcdir)/addcontainer_mnu.cpp $(srcdir)/recentapps.cpp $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp ../core/extensionSettings.h $(srcdir)/addspecialbutton_mnu.cpp $(srcdir)/removespecialbutton_mnu.cpp $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp nonKDEButtonSettings.cpp exe_dlg.moc addspecialbutton_mnu.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc service_mnu.moc addcontainer_mnu.moc browser_dlg.moc addbutton_mnu.moc removebutton_mnu.moc client_mnu.moc quickbrowser_mnu.moc removespecialbutton_mnu.moc addextension_mnu.moc
- @echo 'creating libkicker_ui_la.all_cpp.cpp ...'; \
- rm -f libkicker_ui_la.all_cpp.files libkicker_ui_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkicker_ui_la.all_cpp.final; \
---- kioslave/about/Makefile.in
-+++ kioslave/about/Makefile.in
-@@ -282,6 +282,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kioslave/cgi/Makefile.in
++++ kioslave/cgi/Makefile.in
+@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23228,7 +27790,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -610,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23237,7 +27799,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -648,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23249,9 +27811,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kioslave/cgi/kcmcgi/Makefile.in
-+++ kioslave/cgi/kcmcgi/Makefile.in
-@@ -282,6 +282,9 @@
+--- kioslave/filter/Makefile.in
++++ kioslave/filter/Makefile.in
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23261,16 +27823,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23282,8 +27844,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kioslave/cgi/Makefile.in
-+++ kioslave/cgi/Makefile.in
+--- kioslave/finger/Makefile.in
++++ kioslave/finger/Makefile.in
@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23294,7 +27856,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23303,7 +27865,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23315,9 +27877,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kioslave/filter/Makefile.in
-+++ kioslave/filter/Makefile.in
-@@ -282,6 +282,9 @@
+--- kioslave/fish/Makefile.in
++++ kioslave/fish/Makefile.in
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23327,16 +27889,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -598,7 +601,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23348,9 +27910,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kioslave/finger/Makefile.in
-+++ kioslave/finger/Makefile.in
-@@ -282,6 +282,9 @@
+--- kioslave/floppy/Makefile.in
++++ kioslave/floppy/Makefile.in
+@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23360,7 +27922,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -598,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23369,7 +27931,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23381,9 +27943,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kioslave/fish/Makefile.in
-+++ kioslave/fish/Makefile.in
-@@ -282,6 +282,9 @@
+--- kioslave/home/kdedmodule/Makefile.in
++++ kioslave/home/kdedmodule/Makefile.in
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23393,7 +27955,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -598,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23402,7 +27964,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23414,9 +27976,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kioslave/floppy/Makefile.in
-+++ kioslave/floppy/Makefile.in
-@@ -283,6 +283,9 @@
+--- kioslave/home/Makefile.in
++++ kioslave/home/Makefile.in
+@@ -323,6 +323,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23426,7 +27988,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -629,7 +632,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23435,7 +27997,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -667,9 +670,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23449,7 +28011,7 @@
@$(NORMAL_INSTALL)
--- kioslave/info/Makefile.in
+++ kioslave/info/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23459,7 +28021,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -605,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -23468,7 +28030,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -643,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23482,7 +28044,7 @@
@$(NORMAL_INSTALL)
--- kioslave/ldap/Makefile.in
+++ kioslave/ldap/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23492,7 +28054,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -600,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23501,7 +28063,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -638,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23515,7 +28077,7 @@
@$(NORMAL_INSTALL)
--- kioslave/mac/Makefile.in
+++ kioslave/mac/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23525,7 +28087,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -598,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23534,7 +28096,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23546,7 +28108,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -936,14 +939,14 @@
+@@ -952,14 +955,14 @@
#>+ 10
install-kde-icons:
@@ -23566,7 +28128,7 @@
force-reedit:
--- kioslave/Makefile.in
+++ kioslave/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -268,6 +268,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23576,7 +28138,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -547,7 +550,7 @@
+@@ -563,7 +566,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -23585,7 +28147,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +588,9 @@
+@@ -601,9 +604,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23599,7 +28161,7 @@
mostlyclean-libtool:
--- kioslave/man/Makefile.in
+++ kioslave/man/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -320,6 +320,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23609,7 +28171,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -637,7 +640,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23618,7 +28180,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -675,9 +678,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23630,9 +28192,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kioslave/media/kdedmodule/Makefile.in
-+++ kioslave/media/kdedmodule/Makefile.in
-@@ -320,6 +320,9 @@
+--- kioslave/media/kcmodule/Makefile.in
++++ kioslave/media/kcmodule/Makefile.in
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23642,7 +28204,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -627,7 +630,7 @@
+@@ -614,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23651,7 +28213,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -665,9 +668,9 @@
+@@ -652,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23663,18 +28225,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1017,7 +1020,7 @@
- -rm -f removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc
-
- #>+ 2
--KDE_DIST=fstabbackend.h mediadirnotify.h linuxcdpolling.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am
-+KDE_DIST=fstabbackend.h linuxcdpolling.h mediadirnotify.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am
-
- #>+ 5
- clean-idl:
--- kioslave/media/kfile-plugin/Makefile.in
+++ kioslave/media/kfile-plugin/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23684,7 +28237,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23693,7 +28246,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23707,7 +28260,7 @@
@$(NORMAL_INSTALL)
--- kioslave/media/libmediacommon/Makefile.in
+++ kioslave/media/libmediacommon/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23717,7 +28270,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23726,7 +28279,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23740,7 +28293,7 @@
clean-noinstLTLIBRARIES:
--- kioslave/media/Makefile.in
+++ kioslave/media/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -324,6 +324,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23750,7 +28303,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -615,7 +618,7 @@
+@@ -633,7 +636,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23759,7 +28312,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +656,9 @@
+@@ -671,9 +674,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23771,9 +28324,84 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- kioslave/media/mediamanager/Makefile.in
++++ kioslave/media/mediamanager/Makefile.in
+@@ -333,6 +333,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -642,7 +645,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -680,9 +683,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -1032,7 +1035,7 @@
+ -rm -f removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc
+
+ #>+ 2
+-KDE_DIST=fstabbackend.h mediadirnotify.h linuxcdpolling.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am
++KDE_DIST=fstabbackend.h linuxcdpolling.h mediadirnotify.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am
+
+ #>+ 5
+ clean-idl:
+--- kioslave/media/medianotifier/Makefile.in
++++ kioslave/media/medianotifier/Makefile.in
+@@ -303,6 +303,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -609,7 +612,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -647,9 +650,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- kioslave/media/mimetypes/Makefile.in
+++ kioslave/media/mimetypes/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23783,7 +28411,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -569,7 +572,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23792,7 +28420,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -607,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23806,7 +28434,7 @@
mostlyclean-libtool:
--- kioslave/media/mounthelper/Makefile.in
+++ kioslave/media/mounthelper/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23816,7 +28444,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -581,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23825,7 +28453,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23839,7 +28467,7 @@
@$(NORMAL_INSTALL)
--- kioslave/media/services/Makefile.in
+++ kioslave/media/services/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23849,7 +28477,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23858,7 +28486,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23872,7 +28500,7 @@
mostlyclean-libtool:
--- kioslave/nfs/Makefile.in
+++ kioslave/nfs/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -307,6 +307,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23882,7 +28510,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -609,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -23891,7 +28519,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -647,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23905,7 +28533,7 @@
@$(NORMAL_INSTALL)
--- kioslave/nntp/Makefile.in
+++ kioslave/nntp/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23915,7 +28543,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23924,7 +28552,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23938,7 +28566,7 @@
@$(NORMAL_INSTALL)
--- kioslave/pop3/Makefile.in
+++ kioslave/pop3/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23948,7 +28576,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -23957,7 +28585,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23971,7 +28599,7 @@
@$(NORMAL_INSTALL)
--- kioslave/remote/kdedmodule/Makefile.in
+++ kioslave/remote/kdedmodule/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23981,7 +28609,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -599,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23990,7 +28618,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -637,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24004,7 +28632,7 @@
@$(NORMAL_INSTALL)
--- kioslave/remote/Makefile.in
+++ kioslave/remote/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -323,6 +323,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24014,7 +28642,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -629,7 +632,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24023,7 +28651,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -667,9 +670,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24037,7 +28665,7 @@
@$(NORMAL_INSTALL)
--- kioslave/settings/Makefile.in
+++ kioslave/settings/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24047,7 +28675,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -611,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24056,7 +28684,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -649,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24070,7 +28698,7 @@
@$(NORMAL_INSTALL)
--- kioslave/sftp/Makefile.in
+++ kioslave/sftp/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -308,6 +308,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24080,7 +28708,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -610,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24089,7 +28717,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -648,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24103,7 +28731,7 @@
@$(NORMAL_INSTALL)
--- kioslave/smb/Makefile.in
+++ kioslave/smb/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -307,6 +307,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24113,7 +28741,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -622,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24122,7 +28750,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -660,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24136,7 +28764,7 @@
@$(NORMAL_INSTALL)
--- kioslave/smtp/Makefile.in
+++ kioslave/smtp/Makefile.in
-@@ -315,6 +315,9 @@
+@@ -329,6 +329,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24146,7 +28774,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -625,7 +628,7 @@
+@@ -641,7 +644,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24155,7 +28783,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -663,9 +666,9 @@
+@@ -679,9 +682,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24169,7 +28797,7 @@
@$(NORMAL_INSTALL)
--- kioslave/system/entries/Makefile.in
+++ kioslave/system/entries/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -263,6 +263,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24179,7 +28807,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24188,7 +28816,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24198,11 +28826,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
--- kioslave/system/kdedmodule/Makefile.in
+++ kioslave/system/kdedmodule/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24212,7 +28840,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -599,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24221,7 +28849,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -637,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24235,7 +28863,7 @@
@$(NORMAL_INSTALL)
--- kioslave/system/Makefile.in
+++ kioslave/system/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -323,6 +323,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24245,7 +28873,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -628,7 +631,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24254,7 +28882,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -666,9 +669,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24268,7 +28896,7 @@
@$(NORMAL_INSTALL)
--- kioslave/system/mimetypes/Makefile.in
+++ kioslave/system/mimetypes/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24278,7 +28906,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24287,7 +28915,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24301,7 +28929,7 @@
mostlyclean-libtool:
--- kioslave/tar/Makefile.in
+++ kioslave/tar/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24311,7 +28939,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -604,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -24320,7 +28948,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -642,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24334,7 +28962,7 @@
@$(NORMAL_INSTALL)
--- kioslave/thumbnail/Makefile.in
+++ kioslave/thumbnail/Makefile.in
-@@ -333,6 +333,9 @@
+@@ -341,6 +341,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24344,7 +28972,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -671,7 +674,7 @@
+@@ -678,7 +681,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24353,7 +28981,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -709,9 +712,9 @@
+@@ -716,9 +719,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24367,7 +28995,7 @@
@$(NORMAL_INSTALL)
--- kioslave/trash/kfile-plugin/Makefile.in
+++ kioslave/trash/kfile-plugin/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24377,7 +29005,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24386,7 +29014,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24400,7 +29028,7 @@
@$(NORMAL_INSTALL)
--- kioslave/trash/Makefile.in
+++ kioslave/trash/Makefile.in
-@@ -315,6 +315,9 @@
+@@ -329,6 +329,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24410,7 +29038,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -638,7 +641,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24419,7 +29047,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -660,9 +663,9 @@
+@@ -676,9 +679,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24433,7 +29061,7 @@
@$(NORMAL_INSTALL)
--- klipper/Makefile.in
+++ klipper/Makefile.in
-@@ -333,6 +333,9 @@
+@@ -347,6 +347,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24443,7 +29071,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -661,7 +664,7 @@
+@@ -677,7 +680,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24452,7 +29080,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -699,9 +702,9 @@
+@@ -715,9 +718,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24464,7 +29092,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1235,18 +1238,18 @@
+@@ -1251,18 +1254,18 @@
mocs: history.moc
#>+ 3
@@ -24489,7 +29117,7 @@
#>+ 3
clipboardpoll.moc: $(srcdir)/clipboardpoll.h
-@@ -1285,7 +1288,7 @@
+@@ -1301,7 +1304,7 @@
#>+ 3
clean-metasources:
@@ -24497,50 +29125,47 @@
+ -rm -f history.moc configdialog.moc urlgrabber.moc clipboardpoll.moc klipperpopup.moc toplevel.moc popupproxy.moc applet.moc
#>+ 2
- KDE_DIST=crsc-app-klipper.svgz cr64-app-klipper.png popupproxy.h klipperbindings.cpp Makefile.in historystringitem.h cr22-app-klipper.png cr32-app-klipper.png urlgrabber.h klipperrc.upd configdialog.h klipper-1-2.pl history.h klippershortcuts.upd applet.h toplevel.h klipperrc.desktop klipperpopup.h cr48-app-klipper.png klipper.desktop clipboardpoll.h klipper-kde31.sh historyitem.h cr128-app-klipper.png cr16-app-klipper.png historyimageitem.h version.h Makefile.am
-@@ -1301,29 +1304,29 @@
+ KDE_DIST=popupproxy.h klipperbindings.cpp Makefile.in hisc-app-klipper.svgz historystringitem.h hi32-app-klipper.png urlgrabber.h klipperrc.upd configdialog.h klipper-1-2.pl history.h klippershortcuts.upd applet.h toplevel.h hi128-app-klipper.png hi48-app-klipper.png klipperrc.desktop klipperpopup.h klipper.desktop hi22-app-klipper.png hi16-app-klipper.png clipboardpoll.h klipper-kde31.sh historyitem.h hi64-app-klipper.png historyimageitem.h version.h Makefile.am
+@@ -1317,29 +1320,29 @@
#>+ 25
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/klipper.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/klipper.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/klipper.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/klipper.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/klipper.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/klipper.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/klipper.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/klipper.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/klipper.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/klipper.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/klipper.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/klipper.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/klipper.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/klipper.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/klipper.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/klipper.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/klipper.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/klipper.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/klipper.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/klipper.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/klipper.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/klipper.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/klipper.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/klipper.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/klipper.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/klipper.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/klipper.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/klipper.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
#>+ 15
force-reedit:
-@@ -1376,7 +1379,7 @@
+@@ -1392,7 +1395,7 @@
rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files
#>+ 11
@@ -24551,7 +29176,7 @@
echo "#define KDE_USE_FINAL 1" >> libklipper_common_la.all_cpp.final; \
--- kmenuedit/Makefile.in
+++ kmenuedit/Makefile.in
-@@ -340,6 +340,9 @@
+@@ -354,6 +354,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24561,7 +29186,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -662,7 +665,7 @@
+@@ -678,7 +681,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24570,7 +29195,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -700,9 +703,9 @@
+@@ -716,9 +719,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24582,30 +29207,36 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1295,17 +1298,17 @@
+@@ -1311,20 +1314,20 @@
- #>+ 13
+ #>+ 16
install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenuedit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenuedit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenuedit.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenuedit.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmenuedit.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmenuedit.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenuedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenuedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenuedit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenuedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmenuedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmenuedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
#>+ 15
force-reedit:
--- kmenuedit/pixmaps/Makefile.in
+++ kmenuedit/pixmaps/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24615,7 +29246,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -543,7 +546,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24624,7 +29255,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -581,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24636,7 +29267,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -717,34 +720,34 @@
+@@ -733,34 +736,34 @@
#>+ 30
install-kde-icons:
@@ -24689,7 +29320,7 @@
force-reedit:
--- knetattach/Makefile.in
+++ knetattach/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24699,7 +29330,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -595,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24708,7 +29339,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -633,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24720,50 +29351,60 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -910,28 +913,28 @@
+@@ -914,7 +917,7 @@
+ .NOEXPORT:
+ #>+ 2
+-KDE_DIST=hi22-app-knetattach.png hisc-app-knetattach.svgz hi128-app-knetattach.png Makefile.in knetattach.ui hi64-app-knetattach.png knetattach.ui.h hi16-app-knetattach.png hi48-app-knetattach.png knetattach.desktop hi32-app-knetattach.png Makefile.am
++KDE_DIST=hi22-app-knetattach.png hi128-app-knetattach.png hisc-app-knetattach.svgz Makefile.in knetattach.ui hi64-app-knetattach.png knetattach.ui.h hi16-app-knetattach.png hi48-app-knetattach.png knetattach.desktop hi32-app-knetattach.png Makefile.am
+
+ #>+ 4
+ clean-ui:
+@@ -926,29 +929,29 @@
+
#>+ 25
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knetattach.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knetattach.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/knetattach.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/knetattach.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knetattach.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/knetattach.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/knetattach.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/knetattach.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knetattach.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knetattach.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knetattach.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knetattach.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/knetattach.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knetattach.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knetattach.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knetattach.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/knetattach.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/knetattach.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knetattach.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/knetattach.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/knetattach.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/knetattach.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knetattach.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knetattach.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knetattach.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knetattach.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/knetattach.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knetattach.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
#>+ 15
+ force-reedit:
--- konqueror/about/Makefile.in
+++ konqueror/about/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24773,7 +29414,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -602,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24782,7 +29423,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -640,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24796,7 +29437,7 @@
@$(NORMAL_INSTALL)
--- konqueror/client/Makefile.in
+++ konqueror/client/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -316,6 +316,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24806,7 +29447,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -627,7 +630,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24815,7 +29456,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -665,9 +668,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24829,7 +29470,7 @@
@$(NORMAL_INSTALL)
--- konqueror/iconview/Makefile.in
+++ konqueror/iconview/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24839,7 +29480,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24848,7 +29489,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24862,7 +29503,7 @@
@$(NORMAL_INSTALL)
--- konqueror/keditbookmarks/Makefile.in
+++ konqueror/keditbookmarks/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -319,6 +319,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24872,7 +29513,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -635,7 +638,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24881,7 +29522,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -673,9 +676,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24893,7 +29534,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1082,18 +1085,18 @@
+@@ -1128,18 +1131,18 @@
mocs: updater.moc
#>+ 3
@@ -24918,7 +29559,7 @@
#>+ 3
bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
-@@ -1103,11 +1106,11 @@
+@@ -1149,11 +1152,11 @@
mocs: bookmarkinfo.moc
#>+ 3
@@ -24933,7 +29574,7 @@
#>+ 3
dcop.moc: $(srcdir)/dcop.h
-@@ -1117,18 +1120,18 @@
+@@ -1163,18 +1166,18 @@
mocs: dcop.moc
#>+ 3
@@ -24952,12 +29593,12 @@
+ -rm -f favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc toplevel.moc importers.moc bookmarkinfo.moc testlink.moc dcop.moc listview.moc
#>+ 2
--KDE_DIST=exporters.h importers.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h Makefile.am
-+KDE_DIST=exporters.h importers.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr32-app-keditbookmarks.png cr64-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h Makefile.am
+-KDE_DIST=exporters.h importers.h kebsearchline.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc settings.kcfgc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h keditbookmarks.kcfg Makefile.am
++KDE_DIST=exporters.h importers.h kebsearchline.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc settings.kcfgc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr32-app-keditbookmarks.png cr64-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h keditbookmarks.kcfg Makefile.am
#>+ 5
clean-idl:
-@@ -1141,20 +1144,20 @@
+@@ -1192,20 +1195,20 @@
#>+ 16
install-kde-icons:
@@ -24984,18 +29625,18 @@
#>+ 15
force-reedit:
-@@ -1195,7 +1198,7 @@
+@@ -1246,7 +1249,7 @@
#>+ 11
--libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp $(srcdir)/toplevel.cpp $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc importers.moc toplevel.moc testlink.moc dcop.moc bookmarkinfo.moc listview.moc
-+libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp $(srcdir)/toplevel.cpp $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc toplevel.moc importers.moc listview.moc dcop.moc bookmarkinfo.moc testlink.moc
+-libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp settings.h $(srcdir)/toplevel.cpp settings.h $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp $(srcdir)/kebsearchline.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp settings.cpp settings.h favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc importers.moc toplevel.moc testlink.moc dcop.moc bookmarkinfo.moc listview.moc
++libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp settings.h $(srcdir)/toplevel.cpp settings.h $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp $(srcdir)/kebsearchline.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp settings.cpp settings.h favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc toplevel.moc importers.moc listview.moc dcop.moc bookmarkinfo.moc testlink.moc
@echo 'creating libkdeinit_keditbookmarks_la.all_cpp.cpp ...'; \
rm -f libkdeinit_keditbookmarks_la.all_cpp.files libkdeinit_keditbookmarks_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_keditbookmarks_la.all_cpp.final; \
--- konqueror/kttsplugin/Makefile.in
+++ konqueror/kttsplugin/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25005,7 +29646,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -593,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25014,7 +29655,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -631,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25028,7 +29669,7 @@
@$(NORMAL_INSTALL)
--- konqueror/listview/Makefile.in
+++ konqueror/listview/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -306,6 +306,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25038,7 +29679,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -623,7 +626,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -25047,7 +29688,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -661,9 +664,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25061,7 +29702,7 @@
@$(NORMAL_INSTALL)
--- konqueror/Makefile.in
+++ konqueror/Makefile.in
-@@ -329,6 +329,9 @@
+@@ -363,6 +363,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25071,7 +29712,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -689,7 +692,7 @@
+@@ -729,7 +732,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -25080,7 +29721,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -727,9 +730,9 @@
+@@ -767,9 +770,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25092,7 +29733,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1401,6 +1404,13 @@
+@@ -1481,6 +1484,13 @@
mocs: konq_frame.moc
#>+ 3
@@ -25106,7 +29747,7 @@
konq_misc.moc: $(srcdir)/konq_misc.h
$(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
-@@ -1415,11 +1425,11 @@
+@@ -1495,11 +1505,11 @@
mocs: konq_browseriface.moc
#>+ 3
@@ -25121,7 +29762,7 @@
#>+ 3
konq_run.moc: $(srcdir)/konq_run.h
-@@ -1429,13 +1439,6 @@
+@@ -1509,13 +1519,6 @@
mocs: konq_run.moc
#>+ 3
@@ -25135,7 +29776,7 @@
konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h
$(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc
-@@ -1474,10 +1477,10 @@
+@@ -1554,10 +1557,10 @@
#>+ 3
clean-metasources:
@@ -25143,23 +29784,23 @@
+ -rm -f konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_tabs.moc konq_misc.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc konq_extensionmanager.moc
#>+ 2
--KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop konq-simplebrowser.rc IDEAS konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am
-+KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop IDEAS konq-simplebrowser.rc konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am
+-KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop konq-simplebrowser.rc IDEAS konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop konq_settingsxt.kcfgc Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am
++KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop IDEAS konq-simplebrowser.rc konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop konq_settingsxt.kcfgc Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am
#>+ 6
clean-idl:
-@@ -1532,7 +1535,7 @@
+@@ -1617,7 +1620,7 @@
#>+ 11
--libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_tabs.moc konq_misc.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
-+libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_tabs.moc konq_misc.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
+-libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc konq_settingsxt.h $(srcdir)/KonquerorIface.cc konq_settingsxt.h $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc konq_settingsxt.h $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc konq_settingsxt.h $(srcdir)/konq_viewmgr.cc konq_settingsxt.h $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc konq_settingsxt.h $(srcdir)/konq_actions.cc konq_settingsxt.h $(srcdir)/konq_profiledlg.cc konq_settingsxt.h $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc konq_settingsxt.h $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_tabs.moc konq_misc.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
++libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc konq_settingsxt.h $(srcdir)/KonquerorIface.cc konq_settingsxt.h $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc konq_settingsxt.h $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc konq_settingsxt.h $(srcdir)/konq_viewmgr.cc konq_settingsxt.h $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc konq_settingsxt.h $(srcdir)/konq_actions.cc konq_settingsxt.h $(srcdir)/konq_profiledlg.cc konq_settingsxt.h $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc konq_settingsxt.h $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_tabs.moc konq_misc.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
@echo 'creating libkdeinit_konqueror_la.all_cc.cc ...'; \
rm -f libkdeinit_konqueror_la.all_cc.files libkdeinit_konqueror_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_konqueror_la.all_cc.final; \
--- konqueror/pics/actions/Makefile.in
+++ konqueror/pics/actions/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25169,7 +29810,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25178,7 +29819,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25190,7 +29831,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -716,20 +719,20 @@
+@@ -732,20 +735,20 @@
#>+ 17
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions
@@ -25217,7 +29858,7 @@
force-reedit:
--- konqueror/pics/indicators/Makefile.in
+++ konqueror/pics/indicators/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25227,7 +29868,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -553,7 +556,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25236,7 +29877,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -591,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25250,7 +29891,7 @@
mostlyclean-libtool:
--- konqueror/pics/Makefile.in
+++ konqueror/pics/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25260,7 +29901,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -557,7 +560,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25269,7 +29910,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -595,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25281,69 +29922,68 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -879,39 +882,39 @@
+@@ -895,39 +898,39 @@
#>+ 35
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqueror.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konqueror.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konqueror.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kfm.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
- $(INSTALL_DATA) $(srcdir)/cr22-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konqueror.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqueror.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfm.png
++ $(INSTALL_DATA) $(srcdir)/hi48-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
++ $(INSTALL_DATA) $(srcdir)/hi32-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfm.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
+- $(INSTALL_DATA) $(srcdir)/hi22-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
+- $(INSTALL_DATA) $(srcdir)/hi32-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+ $(INSTALL_DATA) $(srcdir)/hi16-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
+- $(INSTALL_DATA) $(srcdir)/hi64-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+- $(INSTALL_DATA) $(srcdir)/hi48-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqueror.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konqueror.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konqueror.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kfm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konqueror.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqueror.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfm.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
#>+ 15
force-reedit:
--- konqueror/pics/tiles/Makefile.in
+++ konqueror/pics/tiles/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25353,7 +29993,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -553,7 +556,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25362,7 +30002,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -591,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25376,7 +30016,7 @@
mostlyclean-libtool:
--- konqueror/preloader/Makefile.in
+++ konqueror/preloader/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25386,7 +30026,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -25395,7 +30035,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25409,7 +30049,7 @@
@$(NORMAL_INSTALL)
--- konqueror/quickprint/Makefile.in
+++ konqueror/quickprint/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25419,7 +30059,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -557,7 +560,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25428,7 +30068,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -595,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25440,7 +30080,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -741,7 +744,7 @@
+@@ -757,7 +760,7 @@
.NOEXPORT:
#>+ 2
@@ -25451,7 +30091,7 @@
docs-am:
--- konqueror/remoteencodingplugin/Makefile.in
+++ konqueror/remoteencodingplugin/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25461,7 +30101,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25470,7 +30110,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25484,7 +30124,7 @@
@$(NORMAL_INSTALL)
--- konqueror/shellcmdplugin/Makefile.in
+++ konqueror/shellcmdplugin/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25494,7 +30134,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25503,7 +30143,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25517,7 +30157,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/Makefile.in
+++ konqueror/sidebar/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -338,6 +338,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25527,7 +30167,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -650,7 +653,7 @@
+@@ -666,7 +669,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25536,7 +30176,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -688,9 +691,9 @@
+@@ -704,9 +707,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25550,7 +30190,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/test/Makefile.in
+++ konqueror/sidebar/test/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -311,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25560,7 +30200,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -624,7 +627,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25569,7 +30209,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -662,9 +665,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25583,7 +30223,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/trees/bookmark_module/Makefile.in
+++ konqueror/sidebar/trees/bookmark_module/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25593,7 +30233,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25602,7 +30242,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25616,7 +30256,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/trees/dirtree_module/Makefile.in
+++ konqueror/sidebar/trees/dirtree_module/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25626,7 +30266,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -593,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25635,7 +30275,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -631,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25649,7 +30289,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/trees/history_module/Makefile.in
+++ konqueror/sidebar/trees/history_module/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -309,6 +309,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25659,7 +30299,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -618,7 +621,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25668,7 +30308,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -656,9 +659,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25682,7 +30322,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/trees/init/Makefile.in
+++ konqueror/sidebar/trees/init/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25692,7 +30332,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -585,7 +588,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25701,7 +30341,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25715,7 +30355,7 @@
mostlyclean-libtool:
--- konqueror/sidebar/trees/init/remote/ftp/Makefile.in
+++ konqueror/sidebar/trees/init/remote/ftp/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25725,7 +30365,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25734,7 +30374,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25748,7 +30388,7 @@
mostlyclean-libtool:
--- konqueror/sidebar/trees/init/remote/Makefile.in
+++ konqueror/sidebar/trees/init/remote/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25758,7 +30398,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -568,7 +571,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25767,7 +30407,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -606,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25781,7 +30421,7 @@
mostlyclean-libtool:
--- konqueror/sidebar/trees/init/remote/web/Makefile.in
+++ konqueror/sidebar/trees/init/remote/web/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25791,7 +30431,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25800,7 +30440,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25814,7 +30454,7 @@
mostlyclean-libtool:
--- konqueror/sidebar/trees/init/services/Makefile.in
+++ konqueror/sidebar/trees/init/services/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25824,7 +30464,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25833,7 +30473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25847,7 +30487,7 @@
mostlyclean-libtool:
--- konqueror/sidebar/trees/Makefile.in
+++ konqueror/sidebar/trees/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -317,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25857,7 +30497,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -622,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25866,7 +30506,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -660,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25880,7 +30520,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/web_module/Makefile.in
+++ konqueror/sidebar/web_module/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25890,7 +30530,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -599,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25899,7 +30539,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -637,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25913,7 +30553,7 @@
@$(NORMAL_INSTALL)
--- konsole/doc/Makefile.in
+++ konsole/doc/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25923,7 +30563,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -557,7 +560,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25932,7 +30572,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -595,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25946,7 +30586,7 @@
mostlyclean-libtool:
--- konsole/doc/VT100/Makefile.in
+++ konsole/doc/VT100/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25956,7 +30596,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -543,7 +546,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25965,7 +30605,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -581,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25979,7 +30619,7 @@
mostlyclean-libtool:
--- konsole/fonts/Makefile.in
+++ konsole/fonts/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25989,7 +30629,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25998,7 +30638,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26012,7 +30652,7 @@
mostlyclean-libtool:
--- konsole/konsole/Makefile.in
+++ konsole/konsole/Makefile.in
-@@ -342,6 +342,9 @@
+@@ -356,6 +356,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26022,7 +30662,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -709,7 +712,7 @@
+@@ -725,7 +728,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26031,7 +30671,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -747,9 +750,9 @@
+@@ -763,9 +766,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26043,7 +30683,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1225,18 +1228,18 @@
+@@ -1241,18 +1244,18 @@
mocs: TEWidget.moc
#>+ 3
@@ -26068,7 +30708,7 @@
#>+ 3
konsole.moc: $(srcdir)/konsole.h
-@@ -1281,18 +1284,18 @@
+@@ -1297,18 +1300,18 @@
mocs: konsole_part.moc
#>+ 3
@@ -26093,7 +30733,7 @@
#>+ 5
kwrited.kidl: $(srcdir)/kwrited.h $(DCOP_DEPENDENCIES)
-@@ -1311,7 +1314,7 @@
+@@ -1327,7 +1330,7 @@
#>+ 3
clean-metasources:
@@ -26102,7 +30742,7 @@
#>+ 2
KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults Makefile.in konsole_part.h konsoleiface.h linefont.src Makefile.am
-@@ -1371,7 +1374,7 @@
+@@ -1387,7 +1390,7 @@
#>+ 11
@@ -26111,7 +30751,7 @@
@echo 'creating libkdeinit_konsole_la.all_cpp.cpp ...'; \
rm -f libkdeinit_konsole_la.all_cpp.files libkdeinit_konsole_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_konsole_la.all_cpp.final; \
-@@ -1453,8 +1456,8 @@
+@@ -1465,8 +1468,8 @@
@rm -f konsole$(EXEEXT)
$(CXXLINK) $(konsole_LDFLAGS) $(konsole_OBJECTS) $(konsole_LDADD) $(LIBS)
@@ -26123,7 +30763,7 @@
nmcheck-am: nmcheck
--- konsole/Makefile.in
+++ konsole/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26133,7 +30773,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -598,7 +601,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26142,7 +30782,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26156,7 +30796,7 @@
@$(NORMAL_INSTALL)
--- konsole/other/icons/Makefile.in
+++ konsole/other/icons/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26166,7 +30806,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26175,7 +30815,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26187,55 +30827,73 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -708,7 +711,7 @@
+@@ -724,7 +727,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=cr16-action-activity.png cr32-action-opentermred.png cr22-action-opentermblue.png Makefile.in cr16-action-silence.png cr16-action-opentermblue.png cr22-action-opentermred.png cr32-action-opentermblue.png cr16-action-opentermred.png Makefile.am
-+KDE_DIST=cr16-action-activity.png cr22-action-opentermblue.png cr32-action-opentermred.png Makefile.in cr16-action-silence.png cr16-action-opentermblue.png cr22-action-opentermred.png cr32-action-opentermblue.png cr16-action-opentermred.png Makefile.am
+-KDE_DIST=cr16-action-activity.png cr22-action-konsoleblue.png cr16-action-konsolered.png cr32-action-opentermred.png cr22-action-opentermblue.png Makefile.in cr16-action-silence.png cr16-action-opentermblue.png cr22-action-opentermred.png cr16-action-konsoleblue.png cr22-action-konsolered.png cr32-action-opentermblue.png cr32-action-konsoleblue.png cr16-action-opentermred.png cr32-action-konsolered.png Makefile.am
++KDE_DIST=cr16-action-activity.png cr22-action-konsoleblue.png cr16-action-konsolered.png cr22-action-opentermblue.png cr32-action-opentermred.png Makefile.in cr16-action-silence.png cr16-action-opentermblue.png cr22-action-opentermred.png cr16-action-konsoleblue.png cr22-action-konsolered.png cr32-action-opentermblue.png cr32-action-konsoleblue.png cr16-action-opentermred.png cr32-action-konsolered.png Makefile.am
#>+ 2
docs-am:
-@@ -716,26 +719,26 @@
- #>+ 23
+@@ -732,37 +735,37 @@
+ #>+ 35
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
$(INSTALL_DATA) $(srcdir)/cr16-action-activity.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions
- $(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
$(INSTALL_DATA) $(srcdir)/cr32-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
$(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
+- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
+- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
++ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
++ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
++ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
#>+ 15
- force-reedit:
--- konsole/other/Makefile.in
+++ konsole/other/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26245,7 +30903,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -584,7 +587,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26254,7 +30912,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -622,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26266,46 +30924,84 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -949,27 +952,27 @@
+@@ -963,29 +966,29 @@
+
+ #>+ 25
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konsole.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konsole.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konsole.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-konsole.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konsole.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konsole.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konsole.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konsole.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konsole.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-konsole.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konsole.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konsole.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-konsole.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konsole.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konsole.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konsole.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konsole.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konsole.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konsole.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konsole.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konsole.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konsole.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konsole.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konsole.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/konsole.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konsole.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konsole.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
#>+ 15
force-reedit:
+--- konsole/other/wallpapers/Makefile.in
++++ konsole/other/wallpapers/Makefile.in
+@@ -260,6 +260,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -552,7 +555,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -590,9 +593,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- kpager/Makefile.in
+++ kpager/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26315,7 +31011,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -600,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26324,7 +31020,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -638,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26336,9 +31032,36 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -968,20 +971,20 @@
+
+ #>+ 16
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpager.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+
+ #>+ 15
+ force-reedit:
--- kpersonalizer/Makefile.in
+++ kpersonalizer/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -316,6 +316,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26348,7 +31071,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -644,7 +647,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26357,7 +31080,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -666,9 +669,9 @@
+@@ -682,9 +685,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26369,7 +31092,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1091,18 +1094,18 @@
+@@ -1107,18 +1110,18 @@
mocs: krefinepage.moc
#>+ 3
@@ -26394,7 +31117,7 @@
#>+ 3
kospage.moc: $(srcdir)/kospage.h
-@@ -1113,7 +1116,7 @@
+@@ -1129,7 +1132,7 @@
#>+ 3
clean-metasources:
@@ -26403,7 +31126,7 @@
#>+ 2
KDE_DIST=kospagedlg.ui Makefile.in uninstall.desktop stylepreview.ui stylepreview.ui.h ksysinfo.h Makefile.am
-@@ -1133,14 +1136,14 @@
+@@ -1149,14 +1152,14 @@
#>+ 10
install-kde-icons:
@@ -26423,7 +31146,7 @@
force-reedit:
--- kpersonalizer/pics/Makefile.in
+++ kpersonalizer/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26433,7 +31156,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26442,7 +31165,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26456,7 +31179,7 @@
mostlyclean-libtool:
--- kreadconfig/Makefile.in
+++ kreadconfig/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26466,7 +31189,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -587,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26475,7 +31198,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -625,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26489,7 +31212,7 @@
@$(NORMAL_INSTALL)
--- kscreensaver/Makefile.in
+++ kscreensaver/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26499,7 +31222,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -605,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26508,7 +31231,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -643,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26522,7 +31245,7 @@
@$(NORMAL_INSTALL)
--- ksmserver/Makefile.in
+++ ksmserver/Makefile.in
-@@ -342,6 +342,9 @@
+@@ -356,6 +356,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26532,7 +31255,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -657,7 +660,7 @@
+@@ -673,7 +676,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26541,7 +31264,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -695,9 +698,9 @@
+@@ -711,9 +714,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26555,7 +31278,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/kcmksplash/Makefile.in
+++ ksplashml/kcmksplash/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -313,6 +313,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26565,7 +31288,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -614,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26574,7 +31297,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -652,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26588,7 +31311,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/kcmksplash/pics/Makefile.in
+++ ksplashml/kcmksplash/pics/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26598,7 +31321,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26607,7 +31330,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26619,48 +31342,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -714,26 +717,26 @@
+@@ -730,26 +733,26 @@
#>+ 22
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksplash.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksplash.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksplash.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksplash.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksplash.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksplash.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ksplash.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksplash.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksplash.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-ksplash.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksplash.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksplash.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksplash.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksplash.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksplash.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksplash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksplash.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksplash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksplash.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ksplash.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksplash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksplash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksplash.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksplash.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksplash.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
#>+ 15
force-reedit:
--- ksplashml/Makefile.in
+++ ksplashml/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -315,6 +315,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26670,7 +31390,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -616,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26679,7 +31399,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -654,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26693,7 +31413,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/pics/Makefile.in
+++ ksplashml/pics/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26703,7 +31423,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -569,7 +572,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26712,7 +31432,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -607,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26726,7 +31446,7 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/blue-bend/Makefile.in
+++ ksplashml/pics/themes/blue-bend/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26736,7 +31456,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26745,7 +31465,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26759,7 +31479,7 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/default/locolor/Makefile.in
+++ ksplashml/pics/themes/default/locolor/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26769,7 +31489,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26778,7 +31498,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26792,7 +31512,7 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/default/Makefile.in
+++ ksplashml/pics/themes/default/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26802,7 +31522,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -569,7 +572,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26811,7 +31531,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -607,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26825,7 +31545,7 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/Makefile.in
+++ ksplashml/pics/themes/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26835,7 +31555,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -558,7 +561,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26844,7 +31564,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -596,9 +599,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26858,7 +31578,7 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/none/Makefile.in
+++ ksplashml/pics/themes/none/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26868,7 +31588,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26877,7 +31597,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26891,7 +31611,7 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/simple/Makefile.in
+++ ksplashml/pics/themes/simple/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26901,7 +31621,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26910,7 +31630,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26924,7 +31644,7 @@
mostlyclean-libtool:
--- ksplashml/themeengine/default/Makefile.in
+++ ksplashml/themeengine/default/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26934,7 +31654,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26943,7 +31663,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26957,7 +31677,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/Makefile.in
+++ ksplashml/themeengine/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -317,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26967,7 +31687,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -617,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26976,7 +31696,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -655,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26990,7 +31710,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/redmond/Makefile.in
+++ ksplashml/themeengine/redmond/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -315,6 +315,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27000,7 +31720,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -617,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27009,7 +31729,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -655,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27023,7 +31743,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/redmond/pics/Makefile.in
+++ ksplashml/themeengine/redmond/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27033,7 +31753,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27042,7 +31762,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27056,7 +31776,7 @@
mostlyclean-libtool:
--- ksplashml/themeengine/simple/Makefile.in
+++ ksplashml/themeengine/simple/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27066,7 +31786,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -579,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27075,7 +31795,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -617,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27089,7 +31809,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/standard/Makefile.in
+++ ksplashml/themeengine/standard/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -324,6 +324,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27099,7 +31819,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -630,7 +633,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27108,7 +31828,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -668,9 +671,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27122,7 +31842,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/standard/pics/Makefile.in
+++ ksplashml/themeengine/standard/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27132,7 +31852,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27141,7 +31861,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27155,7 +31875,7 @@
mostlyclean-libtool:
--- kstart/Makefile.in
+++ kstart/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27165,7 +31885,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -587,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27174,7 +31894,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -625,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27188,7 +31908,7 @@
@$(NORMAL_INSTALL)
--- ksysguard/CContLib/Makefile.in
+++ ksysguard/CContLib/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -275,6 +275,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27198,7 +31918,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -569,7 +572,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -27207,7 +31927,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -607,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27221,7 +31941,7 @@
clean-noinstLIBRARIES:
--- ksysguard/example/Makefile.in
+++ ksysguard/example/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27231,7 +31951,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27240,7 +31960,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27254,7 +31974,7 @@
mostlyclean-libtool:
--- ksysguard/gui/ksgrd/Makefile.in
+++ ksysguard/gui/ksgrd/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27264,7 +31984,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -625,7 +628,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -27273,7 +31993,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -663,9 +666,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27285,7 +32005,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -952,13 +955,6 @@
+@@ -968,13 +971,6 @@
mocs: SensorSocketAgent.moc
#>+ 3
@@ -27299,7 +32019,7 @@
SensorManager.moc: $(srcdir)/SensorManager.h
$(MOC) $(srcdir)/SensorManager.h -o SensorManager.moc
-@@ -966,11 +962,11 @@
+@@ -982,11 +978,11 @@
mocs: SensorManager.moc
#>+ 3
@@ -27314,7 +32034,7 @@
#>+ 3
SensorShellAgent.moc: $(srcdir)/SensorShellAgent.h
-@@ -980,6 +976,13 @@
+@@ -996,6 +992,13 @@
mocs: SensorShellAgent.moc
#>+ 3
@@ -27328,7 +32048,7 @@
HostConnector.moc: $(srcdir)/HostConnector.h
$(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
-@@ -995,7 +998,7 @@
+@@ -1011,7 +1014,7 @@
#>+ 3
clean-metasources:
@@ -27337,7 +32057,7 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-@@ -1046,7 +1049,7 @@
+@@ -1062,7 +1065,7 @@
#>+ 11
@@ -27348,7 +32068,7 @@
echo "#define KDE_USE_FINAL 1" >> libksgrd_la.all_cc.final; \
--- ksysguard/gui/Makefile.in
+++ ksysguard/gui/Makefile.in
-@@ -341,6 +341,9 @@
+@@ -355,6 +355,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27358,7 +32078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -684,7 +687,7 @@
+@@ -700,7 +703,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -27367,7 +32087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -722,9 +725,9 @@
+@@ -738,9 +741,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27381,7 +32101,7 @@
@$(NORMAL_INSTALL)
--- ksysguard/gui/SensorDisplayLib/Makefile.in
+++ ksysguard/gui/SensorDisplayLib/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27391,7 +32111,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -634,7 +637,7 @@
+@@ -650,7 +653,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -27400,7 +32120,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -672,9 +675,9 @@
+@@ -688,9 +691,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27412,7 +32132,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -933,18 +936,18 @@
+@@ -949,18 +952,18 @@
#>+ 3
@@ -27437,7 +32157,7 @@
#>+ 3
DummyDisplay.moc: $(srcdir)/DummyDisplay.h
-@@ -996,18 +999,18 @@
+@@ -1012,18 +1015,18 @@
mocs: ListView.moc
#>+ 3
@@ -27462,7 +32182,7 @@
#>+ 3
DancingBarsSettings.moc: $(srcdir)/DancingBarsSettings.h
-@@ -1067,7 +1070,7 @@
+@@ -1083,7 +1086,7 @@
#>+ 3
clean-metasources:
@@ -27471,7 +32191,7 @@
#>+ 2
KDE_DIST=SignalPlotter.h LogFile.h SensorLoggerSettings.h SensorLoggerSettingsWidget.ui FancyPlotter.h SensorLoggerDlgWidget.ui.h Makefile.in DancingBarsSettings.h BarGraph.h MultiMeterSettingsWidget.ui MultiMeter.h ListViewSettingsWidget.ui.h ProcessList.h SensorDisplay.h SensorLoggerSettingsWidget.ui.h DummyDisplay.h ReniceDlg.h DancingBars.h MultiMeterSettings.h SensorLoggerDlgWidget.ui ListView.h ListViewSettingsWidget.ui SensorLoggerDlg.h FancyPlotterSettings.h SensorLogger.h MultiMeterSettingsWidget.ui.h ProcessController.h ListViewSettings.h Makefile.am LogFileSettings.ui
-@@ -1127,7 +1130,7 @@
+@@ -1143,7 +1146,7 @@
#>+ 11
@@ -27482,7 +32202,7 @@
echo "#define KDE_USE_FINAL 1" >> libsensordisplays_la.all_cc.final; \
--- ksysguard/ksysguardd/FreeBSD/Makefile.in
+++ ksysguard/ksysguardd/FreeBSD/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27492,7 +32212,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -577,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -27501,7 +32221,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -615,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27515,7 +32235,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Irix/Makefile.in
+++ ksysguard/ksysguardd/Irix/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -277,6 +277,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27525,7 +32245,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -570,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -27534,7 +32254,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -608,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27548,7 +32268,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Linux/Makefile.in
+++ ksysguard/ksysguardd/Linux/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27558,7 +32278,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -583,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -27567,7 +32287,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -621,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27581,7 +32301,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Makefile.in
+++ ksysguard/ksysguardd/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27591,7 +32311,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -602,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -27600,7 +32320,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -640,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27614,7 +32334,7 @@
@$(NORMAL_INSTALL)
--- ksysguard/ksysguardd/NetBSD/Makefile.in
+++ ksysguard/ksysguardd/NetBSD/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27624,7 +32344,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -577,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -27633,7 +32353,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -615,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27647,7 +32367,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/OpenBSD/Makefile.in
+++ ksysguard/ksysguardd/OpenBSD/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -275,6 +275,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27657,7 +32377,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -569,7 +572,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -27666,7 +32386,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -607,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27680,7 +32400,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Solaris/Makefile.in
+++ ksysguard/ksysguardd/Solaris/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27690,7 +32410,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -27699,7 +32419,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27713,7 +32433,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Tru64/Makefile.in
+++ ksysguard/ksysguardd/Tru64/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27723,7 +32443,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -582,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -27732,7 +32452,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -620,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27746,7 +32466,7 @@
@$(NORMAL_INSTALL)
--- ksysguard/Makefile.in
+++ ksysguard/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27756,7 +32476,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -560,7 +563,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -27765,7 +32485,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -598,9 +601,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27777,7 +32497,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -882,23 +885,23 @@
+@@ -898,23 +901,23 @@
#>+ 19
install-kde-icons:
@@ -27812,7 +32532,7 @@
force-reedit:
--- ksysguard/pics/Makefile.in
+++ ksysguard/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27822,7 +32542,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27831,7 +32551,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27845,7 +32565,7 @@
mostlyclean-libtool:
--- ksystraycmd/Makefile.in
+++ ksystraycmd/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27855,7 +32575,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -589,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27864,7 +32584,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -627,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27878,7 +32598,7 @@
@$(NORMAL_INSTALL)
--- ktip/Makefile.in
+++ ktip/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27888,7 +32608,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -612,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27897,7 +32617,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -650,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27909,45 +32629,48 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1069,26 +1072,26 @@
+@@ -1085,29 +1088,29 @@
- #>+ 22
+ #>+ 25
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktip.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktip.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ktip.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktip.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ktip.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktip.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-ktip.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ktip.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktip.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktip.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-ktip.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ktip.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktip.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-ktip.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktip.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktip.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ktip.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktip.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ktip.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktip.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ktip.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktip.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktip.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ktip.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktip.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
#>+ 15
force-reedit:
--- ktip/pics/Makefile.in
+++ ktip/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27957,7 +32680,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27966,7 +32689,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27980,7 +32703,7 @@
mostlyclean-libtool:
--- kwin/clients/b2/config/Makefile.in
+++ kwin/clients/b2/config/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27990,7 +32713,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -590,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27999,7 +32722,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -628,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28013,7 +32736,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/b2/Makefile.in
+++ kwin/clients/b2/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -308,6 +308,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28023,7 +32746,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -610,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28032,7 +32755,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -648,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28046,7 +32769,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/default/config/Makefile.in
+++ kwin/clients/default/config/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28056,7 +32779,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -590,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28065,7 +32788,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -628,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28079,7 +32802,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/default/Makefile.in
+++ kwin/clients/default/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -307,6 +307,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28089,7 +32812,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -605,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28098,7 +32821,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -643,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28112,7 +32835,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/keramik/config/Makefile.in
+++ kwin/clients/keramik/config/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28122,7 +32845,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -595,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28131,7 +32854,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -633,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28145,7 +32868,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/keramik/Makefile.in
+++ kwin/clients/keramik/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -318,6 +318,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28155,7 +32878,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -625,7 +628,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28164,7 +32887,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -663,9 +666,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28178,7 +32901,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/kwmtheme/cli_installer/Makefile.in
+++ kwin/clients/kwmtheme/cli_installer/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28188,7 +32911,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -587,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28197,7 +32920,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -625,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28211,7 +32934,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/kwmtheme/Makefile.in
+++ kwin/clients/kwmtheme/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -308,6 +308,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28221,7 +32944,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -608,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28230,7 +32953,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -646,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28244,7 +32967,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/laptop/Makefile.in
+++ kwin/clients/laptop/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28254,7 +32977,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28263,7 +32986,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28277,7 +33000,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/Makefile.in
+++ kwin/clients/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28287,7 +33010,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -28296,7 +33019,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28310,7 +33033,7 @@
mostlyclean-libtool:
--- kwin/clients/modernsystem/config/Makefile.in
+++ kwin/clients/modernsystem/config/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28320,7 +33043,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28329,7 +33052,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28343,7 +33066,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/modernsystem/Makefile.in
+++ kwin/clients/modernsystem/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -308,6 +308,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28353,7 +33076,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -609,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28362,7 +33085,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -647,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28376,7 +33099,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/plastik/config/Makefile.in
+++ kwin/clients/plastik/config/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28386,7 +33109,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28395,7 +33118,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28409,7 +33132,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/plastik/Makefile.in
+++ kwin/clients/plastik/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -312,6 +312,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28419,7 +33142,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -614,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28428,7 +33151,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -652,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28442,7 +33165,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/quartz/config/Makefile.in
+++ kwin/clients/quartz/config/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28452,7 +33175,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -590,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28461,7 +33184,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -628,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28475,7 +33198,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/quartz/Makefile.in
+++ kwin/clients/quartz/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28485,7 +33208,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -611,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28494,7 +33217,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -649,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28508,7 +33231,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/redmond/Makefile.in
+++ kwin/clients/redmond/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28518,7 +33241,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28527,7 +33250,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28541,7 +33264,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/test/Makefile.in
+++ kwin/clients/test/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28551,7 +33274,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28560,7 +33283,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28574,7 +33297,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/web/Makefile.in
+++ kwin/clients/web/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28584,7 +33307,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -599,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28593,7 +33316,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -637,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28605,84 +33328,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -945,20 +948,6 @@
- mocs: WebButtonLower.moc
-
- #>+ 3
--WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h
-- $(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc
--
--#>+ 2
--mocs: WebButtonMaximize.moc
--
--#>+ 3
--WebButtonIconify.moc: $(srcdir)/WebButtonIconify.h
-- $(MOC) $(srcdir)/WebButtonIconify.h -o WebButtonIconify.moc
--
--#>+ 2
--mocs: WebButtonIconify.moc
--
--#>+ 3
- Web.moc: $(srcdir)/Web.h
- $(MOC) $(srcdir)/Web.h -o Web.moc
-
-@@ -966,13 +955,6 @@
- mocs: Web.moc
-
- #>+ 3
--WebButton.moc: $(srcdir)/WebButton.h
-- $(MOC) $(srcdir)/WebButton.h -o WebButton.moc
--
--#>+ 2
--mocs: WebButton.moc
--
--#>+ 3
- WebButtonClose.moc: $(srcdir)/WebButtonClose.h
- $(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc
-
-@@ -994,8 +976,29 @@
- mocs: WebButtonHelp.moc
-
- #>+ 3
-+WebButtonIconify.moc: $(srcdir)/WebButtonIconify.h
-+ $(MOC) $(srcdir)/WebButtonIconify.h -o WebButtonIconify.moc
-+
-+#>+ 2
-+mocs: WebButtonIconify.moc
-+
-+#>+ 3
-+WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h
-+ $(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc
-+
-+#>+ 2
-+mocs: WebButtonMaximize.moc
-+
-+#>+ 3
-+WebButton.moc: $(srcdir)/WebButton.h
-+ $(MOC) $(srcdir)/WebButton.h -o WebButton.moc
-+
-+#>+ 2
-+mocs: WebButton.moc
-+
-+#>+ 3
- clean-metasources:
-- -rm -f WebButtonLower.moc WebButtonMaximize.moc WebButtonIconify.moc Web.moc WebButton.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc
-+ -rm -f WebButtonLower.moc Web.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc WebButtonIconify.moc WebButtonMaximize.moc WebButton.moc
-
- #>+ 2
- KDE_DIST=Makefile.in web.desktop Makefile.am
-@@ -1046,7 +1049,7 @@
-
-
- #>+ 11
--kwin3_web_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Web.cpp $(srcdir)/WebButton.cpp $(srcdir)/WebButtonClose.cpp $(srcdir)/WebButtonHelp.cpp $(srcdir)/WebButtonIconify.cpp $(srcdir)/WebButtonLower.cpp $(srcdir)/WebButtonMaximize.cpp $(srcdir)/WebButtonSticky.cpp WebButtonLower.moc WebButtonIconify.moc WebButtonMaximize.moc WebButton.moc Web.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc
-+kwin3_web_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Web.cpp $(srcdir)/WebButton.cpp $(srcdir)/WebButtonClose.cpp $(srcdir)/WebButtonHelp.cpp $(srcdir)/WebButtonIconify.cpp $(srcdir)/WebButtonLower.cpp $(srcdir)/WebButtonMaximize.cpp $(srcdir)/WebButtonSticky.cpp WebButtonLower.moc Web.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc WebButtonIconify.moc WebButtonMaximize.moc WebButton.moc
- @echo 'creating kwin3_web_la.all_cpp.cpp ...'; \
- rm -f kwin3_web_la.all_cpp.files kwin3_web_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kwin3_web_la.all_cpp.final; \
--- kwin/data/Makefile.in
+++ kwin/data/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28692,7 +33340,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -604,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28701,7 +33349,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -642,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28715,7 +33363,7 @@
@$(NORMAL_INSTALL)
--- kwin/kcmkwin/kwindecoration/Makefile.in
+++ kwin/kcmkwin/kwindecoration/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28725,7 +33373,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -607,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28734,7 +33382,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -645,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28748,7 +33396,7 @@
@$(NORMAL_INSTALL)
--- kwin/kcmkwin/kwinoptions/Makefile.in
+++ kwin/kcmkwin/kwinoptions/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28758,7 +33406,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28767,7 +33415,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28781,7 +33429,7 @@
@$(NORMAL_INSTALL)
--- kwin/kcmkwin/kwinrules/Makefile.in
+++ kwin/kcmkwin/kwinrules/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -331,6 +331,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28791,7 +33439,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -639,7 +642,7 @@
+@@ -655,7 +658,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28800,7 +33448,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -677,9 +680,9 @@
+@@ -693,9 +696,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28814,7 +33462,7 @@
@$(NORMAL_INSTALL)
--- kwin/kcmkwin/Makefile.in
+++ kwin/kcmkwin/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28824,7 +33472,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -28833,7 +33481,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28847,7 +33495,7 @@
mostlyclean-libtool:
--- kwin/killer/Makefile.in
+++ kwin/killer/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28857,7 +33505,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -579,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28866,7 +33514,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -617,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28880,7 +33528,7 @@
@$(NORMAL_INSTALL)
--- kwin/kompmgr/Makefile.in
+++ kwin/kompmgr/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -275,6 +275,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28890,7 +33538,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -568,7 +571,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -28899,7 +33547,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -606,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28913,7 +33561,7 @@
@$(NORMAL_INSTALL)
--- kwin/lib/Makefile.in
+++ kwin/lib/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28923,7 +33571,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -607,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28932,7 +33580,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -645,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28946,7 +33594,7 @@
@$(NORMAL_INSTALL)
--- kwin/Makefile.in
+++ kwin/Makefile.in
-@@ -320,6 +320,9 @@
+@@ -334,6 +334,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28956,7 +33604,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -640,7 +643,7 @@
+@@ -656,7 +659,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28965,7 +33613,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -678,9 +681,9 @@
+@@ -694,9 +697,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28977,7 +33625,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1400,64 +1403,64 @@
+@@ -1333,64 +1336,64 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
#>+ 3
@@ -29066,8 +33714,8 @@
+ -rm -f client.moc workspace.moc tabbox.moc utils.moc popupinfo.moc geometrytip.moc main.moc sm.moc
#>+ 2
- KDE_DIST=NEWCOLORSCHEME.README eventsrc atoms.h main.h workspace.h geometrytip.h Makefile.in options.h placement.h bridge.h plugins.h kwinbindings.cpp LICENSE popupinfo.h utils.h cr48-app-kwin.png killwindow.h cr32-app-kwin.png rules.h kwin.kcfg client.h cr16-app-kwin.png COMPLIANCE sm.h group.h notifications.h Makefile.am tabbox.h
-@@ -1472,17 +1475,17 @@
+ KDE_DIST=NEWCOLORSCHEME.README eventsrc atoms.h main.h workspace.h geometrytip.h Makefile.in options.h placement.h bridge.h plugins.h kwinbindings.cpp LICENSE popupinfo.h utils.h cr48-app-kwin.png killwindow.h cr32-app-kwin.png rules.h kwin.kcfg client.h cr16-app-kwin.png HACKING COMPLIANCE sm.h group.h notifications.h Makefile.am tabbox.h
+@@ -1405,17 +1408,17 @@
#>+ 13
install-kde-icons:
@@ -29091,7 +33739,7 @@
#>+ 15
force-reedit:
-@@ -1523,7 +1526,7 @@
+@@ -1456,7 +1459,7 @@
#>+ 11
@@ -29100,7 +33748,7 @@
@echo 'creating libkdeinit_kwin_la.all_cpp.cpp ...'; \
rm -f libkdeinit_kwin_la.all_cpp.files libkdeinit_kwin_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kwin_la.all_cpp.final; \
-@@ -1580,13 +1583,13 @@
+@@ -1509,13 +1512,13 @@
tabbox.lo: tabbox.moc
main.lo: main.moc
geometrytip.o: geometrytip.moc
@@ -29119,7 +33767,7 @@
geometrytip.lo: geometrytip.moc
--- kwin/oldheaders/Makefile.in
+++ kwin/oldheaders/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -263,6 +263,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29129,7 +33777,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -554,7 +557,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29138,7 +33786,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -592,9 +595,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29152,7 +33800,7 @@
mostlyclean-libtool:
--- kwin/pics/Makefile.in
+++ kwin/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29162,7 +33810,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29171,7 +33819,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29183,7 +33831,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -739,7 +742,7 @@
+@@ -755,7 +758,7 @@
.NOEXPORT:
#>+ 2
@@ -29192,9 +33840,42 @@
#>+ 2
docs-am:
+--- kwin/tools/decobenchmark/Makefile.in
++++ kwin/tools/decobenchmark/Makefile.in
+@@ -284,6 +284,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -579,7 +582,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -617,9 +620,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstPROGRAMS:
--- kwin/tools/Makefile.in
+++ kwin/tools/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29204,7 +33885,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29213,7 +33894,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29227,7 +33908,7 @@
clean-noinstPROGRAMS:
--- kxkb/Makefile.in
+++ kxkb/Makefile.in
-@@ -322,6 +322,9 @@
+@@ -336,6 +336,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29237,7 +33918,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -642,7 +645,7 @@
+@@ -658,7 +661,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29246,7 +33927,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -680,9 +683,9 @@
+@@ -696,9 +699,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29260,7 +33941,7 @@
@$(NORMAL_INSTALL)
--- kxkb/pics/Makefile.in
+++ kxkb/pics/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29270,7 +33951,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29279,7 +33960,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29291,33 +33972,28 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -714,17 +717,17 @@
-
- #>+ 13
+@@ -732,15 +735,15 @@
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kxkb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kxkb.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kxkb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kxkb.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kxkb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kxkb.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kxkb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kxkb.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kxkb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kxkb.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kxkb.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kxkb.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kxkb.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kxkb.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kxkb.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kxkb.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kxkb.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kxkb.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kxkb.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
#>+ 15
force-reedit:
--- l10n/Makefile.in
+++ l10n/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29327,7 +34003,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -561,7 +564,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29336,7 +34012,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -599,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29348,7 +34024,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -756,7 +759,7 @@
+@@ -772,7 +775,7 @@
.NOEXPORT:
#>+ 2
@@ -29359,7 +34035,7 @@
docs-am:
--- libkonq/favicons/Makefile.in
+++ libkonq/favicons/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29369,7 +34045,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -604,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29378,7 +34054,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -642,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29392,7 +34068,7 @@
@$(NORMAL_INSTALL)
--- libkonq/Makefile.in
+++ libkonq/Makefile.in
-@@ -340,6 +340,9 @@
+@@ -354,6 +354,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29402,7 +34078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -678,7 +681,7 @@
+@@ -695,7 +698,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29411,7 +34087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -716,9 +719,9 @@
+@@ -733,9 +736,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29423,7 +34099,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1425,18 +1428,18 @@
+@@ -1359,18 +1362,18 @@
mocs: knewmenu.moc
#>+ 3
@@ -29448,7 +34124,7 @@
#>+ 3
konq_faviconmgr.moc: $(srcdir)/konq_faviconmgr.h
-@@ -1491,7 +1494,7 @@
+@@ -1425,7 +1428,7 @@
#>+ 3
clean-metasources:
@@ -29457,7 +34133,7 @@
#>+ 2
KDE_DIST=SERVICEMENUS DESIGN Makefile.in konq_bgnddlg.h directory_bookmarkbar.desktop konqpopupmenuplugin.desktop PLUGINS Makefile.am
-@@ -1549,7 +1552,7 @@
+@@ -1483,7 +1486,7 @@
#>+ 11
@@ -29466,7 +34142,7 @@
@echo 'creating libkonq_la.all_cc.cc ...'; \
rm -f libkonq_la.all_cc.files libkonq_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libkonq_la.all_cc.final; \
-@@ -1594,8 +1597,8 @@
+@@ -1524,8 +1527,8 @@
konq_bgnddlg.o: konq_bgnddlg.moc
konq_bgnddlg.lo: konq_bgnddlg.moc
konq_faviconmgr.lo: konq_faviconmgr.moc
@@ -29478,7 +34154,7 @@
konq_popupmenu.o: konq_popupmenu.moc
--- libkonq/pics/Makefile.in
+++ libkonq/pics/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29488,7 +34164,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29497,7 +34173,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29509,9 +34185,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+--- libkonq/tests/Makefile.in
++++ libkonq/tests/Makefile.in
+@@ -279,6 +279,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -574,7 +577,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -612,9 +615,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-checkPROGRAMS:
--- Makefile.in
+++ Makefile.in
-@@ -274,6 +274,9 @@
+@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29521,7 +34230,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -589,7 +592,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -29530,7 +34239,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,12 +618,12 @@
+@@ -631,12 +634,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -29545,7 +34254,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -632,7 +635,7 @@
+@@ -648,7 +651,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -29554,18 +34263,18 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -1252,7 +1255,7 @@
+@@ -1185,7 +1188,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=startkde subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 kdebase.lsm Makefile.am.in
-+KDE_DIST=startkde stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 configure Makefile.am Makefile.am.in kdebase.lsm
+-KDE_DIST=startkde Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 kdebase.lsm Makefile.am.in
++KDE_DIST=startkde stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 configure Makefile.am Makefile.am.in kdebase.lsm
#>+ 2
docs-am:
--- nsplugins/Makefile.in
+++ nsplugins/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -331,6 +331,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29575,7 +34284,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -634,7 +637,7 @@
+@@ -650,7 +653,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29584,7 +34293,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -672,9 +675,9 @@
+@@ -688,9 +691,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29598,7 +34307,7 @@
@$(NORMAL_INSTALL)
--- nsplugins/test/Makefile.in
+++ nsplugins/test/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29608,7 +34317,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -579,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29617,7 +34326,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -617,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29631,7 +34340,7 @@
clean-checkPROGRAMS:
--- nsplugins/viewer/Makefile.in
+++ nsplugins/viewer/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29641,7 +34350,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29650,7 +34359,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29664,7 +34373,7 @@
@$(NORMAL_INSTALL)
--- nsplugins/wrapper/Makefile.in
+++ nsplugins/wrapper/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29674,7 +34383,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -571,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -29683,7 +34392,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29697,7 +34406,7 @@
@$(NORMAL_INSTALL)
--- pics/crystalsvg/Makefile.in
+++ pics/crystalsvg/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29707,7 +34416,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29716,7 +34425,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29728,26 +34437,33 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -707,786 +710,786 @@
+@@ -723,840 +726,840 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-xedit.png cr48-app-gaim.png crsc-app-antivirus.svgz cr16-app-assistant.png cr32-app-mozilla.png cr64-app-licq.png cr32-app-xmag.png cr16-app-applixware.png cr48-app-xv.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-linuxconf.png cr48-app-package_settings.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-realplayer.png cr16-app-package_edutainment.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-mathematica.png cr32-app-gnumeric.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png cr16-app-xfig.png cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png cr64-app-linuxconf.png cr32-app-edu_science.png cr16-app-package_wordprocessing.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_utilities.png cr128-app-package_development.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr48-app-galeon.png cr64-app-package_multimedia.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr64-app-phppg.png cr32-app-blender.png cr16-app-sodipodi.png cr32-app-xedit.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz crsc-app-aktion.svgz cr16-app-licq.png cr128-app-pysol.png cr32-app-package_multimedia.png cr16-app-kvirc.png cr16-app-netscape.png cr128-app-linuxconf.png Makefile.in cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr128-app-package_network.png cr32-app-pybliographic.png cr16-app-designer.png cr32-app-eclipse.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-mathematica.png cr16-app-pybliographic.png cr16-app-clanbomber.png cr64-app-kfm_home.png cr22-app-package_development.png crsc-app-terminal.svgz cr32-app-xapp.png cr48-app-licq.png cr16-app-package_applications.png cr48-app-xfmail.png cr64-app-applixware.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png cr64-app-package.png crsc-app-quicktime.svgz cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr32-app-package_games.png cr32-app-wine.png cr64-app-wp.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png cr32-app-package_games_board.png cr64-app-penguin.png cr48-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr32-app-terminal.png cr16-app-package_application.png cr16-app-package_games.png cr48-app-staroffice.png cr16-app-phppg.png cr48-app-gnucash.png crsc-app-xcalc.svgz cr48-app-mozilla.png cr32-app-package_games_arcade.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr48-app-opera.png cr128-app-terminal.png cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-x.png cr48-app-kfm_home.png cr16-app-mozilla.png crsc-app-xclock.svgz cr32-app-clanbomber.png cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr48-app-xemacs.png cr48-app-package.png cr64-app-gimp.png cr48-app-pan.png cr16-app-blender.png cr48-app-pysol.png cr48-app-designer.png cr48-app-package_games_strategy.png cr64-app-randr.png crsc-app-my_mac.svgz cr32-app-xeyes.png cr32-app-acroread.png cr16-app-evolution.png crsc-app-shell.svgz cr48-app-xchat.png cr16-app-acroread.png cr64-app-package_settings.png cr128-app-email.png cr128-app-applixware.png cr48-app-planner.png cr48-app-vnc.png cr128-app-staroffice.png cr32-app-xcalc.png crsc-app-gnome_apps.svgz cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-package_games_strategy.png cr32-app-gv.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr32-app-xfig.png cr16-app-gvim.png cr16-app-linuxconf.png cr16-app-wabi.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr16-app-lyx.png cr32-app-vnc.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png cr32-app-package_edutainment.png crsc-app-x.svgz cr48-app-randr.png crsc-app-camera.svgz cr48-app-abiword.png cr16-app-nedit.png cr32-app-linuxconf.png cr16-app-xv.png cr32-app-gabber.png cr16-app-gnomemeeting.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr16-app-gv.png cr48-app-netscape.png cr16-app-package_development.png cr64-app-xmag.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr128-app-mozilla.png cr48-app-kvirc.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-gimp.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-vnc.png cr16-app-package_network.png cr16-app-kfm_home.png cr32-app-xclock.png cr32-app-wabi.png cr128-app-clanbomber.png cr48-app-scribus.png cr128-app-tux.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr48-app-package_system.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-email.png cr32-app-package_utilities.png cr48-app-nedit.png cr128-app-penguin.png cr16-app-gaim.png cr128-app-xmag.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr32-app-xmms.png cr48-app-package_development.png cr48-app-package_toys.png cr32-app-abiword.png cr32-app-xemacs.png crsc-app-wine.svgz cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr32-app-alevt.png cr64-app-mozilla.png cr16-app-xmms.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr16-app-planner.png cr32-app-nedit.png cr128-app-netscape.png cr16-app-package.png cr32-app-kvirc.png cr32-app-package_graphics.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png crsc-app-error.svgz cr48-app-tux.png cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr128-app-package_favourite.png cr32-app-xconsole.png cr16-app-bluefish.png cr64-app-qtella.png crsc-app-package_development.svgz crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr64-app-acroread.png cr48-app-package_graphics.png cr32-app-wp.png crsc-app-download_manager.svgz cr16-app-wp.png cr16-app-package_graphics.png cr32-app-firefox.png cr16-app-edu_miscellaneous.png cr32-app-galeon.png cr48-app-dia.png cr32-app-plan.png cr16-app-linguist.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-package_editors.png cr48-app-firefox.png cr48-app-phppg.png cr128-app-package.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr48-app-package_games_card.png cr64-app-netscape.png cr128-app-xclock.png cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr16-app-xload.png
-+KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-gaim.png cr48-app-xedit.png crsc-app-antivirus.svgz cr16-app-assistant.png cr32-app-mozilla.png cr64-app-licq.png cr48-app-xv.png cr16-app-applixware.png cr32-app-xmag.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-package_settings.png cr48-app-linuxconf.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-package_edutainment.png cr16-app-realplayer.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-gnumeric.png cr32-app-mathematica.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png cr16-app-xfig.png cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png cr64-app-linuxconf.png cr16-app-package_wordprocessing.png cr32-app-edu_science.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_utilities.png cr128-app-package_development.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr48-app-galeon.png cr64-app-package_multimedia.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr32-app-blender.png cr64-app-phppg.png cr32-app-xedit.png cr16-app-sodipodi.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz cr32-app-package_multimedia.png cr128-app-pysol.png cr16-app-licq.png crsc-app-aktion.svgz cr16-app-netscape.png cr16-app-kvirc.png Makefile.in cr128-app-linuxconf.png cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr128-app-package_network.png cr32-app-pybliographic.png cr16-app-designer.png cr32-app-eclipse.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-pybliographic.png cr16-app-mathematica.png cr16-app-clanbomber.png cr22-app-package_development.png crsc-app-terminal.svgz cr64-app-kfm_home.png cr32-app-xapp.png cr48-app-licq.png cr48-app-xfmail.png cr64-app-applixware.png cr16-app-package_applications.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png crsc-app-quicktime.svgz cr64-app-package.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr64-app-wp.png cr32-app-package_games.png cr32-app-wine.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png cr32-app-package_games_board.png cr64-app-penguin.png cr48-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr32-app-terminal.png cr16-app-package_application.png cr16-app-package_games.png cr48-app-staroffice.png cr16-app-phppg.png cr48-app-gnucash.png crsc-app-xcalc.svgz cr32-app-package_games_arcade.png cr48-app-mozilla.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr48-app-opera.png cr128-app-terminal.png cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-x.png cr16-app-mozilla.png cr48-app-kfm_home.png cr32-app-clanbomber.png crsc-app-xclock.svgz cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr64-app-gimp.png cr48-app-pan.png cr48-app-xemacs.png cr48-app-package.png cr48-app-pysol.png cr16-app-blender.png cr48-app-designer.png cr64-app-randr.png cr48-app-package_games_strategy.png crsc-app-my_mac.svgz cr32-app-acroread.png cr16-app-evolution.png cr32-app-xeyes.png crsc-app-shell.svgz cr16-app-acroread.png cr48-app-xchat.png cr64-app-package_settings.png cr128-app-email.png cr48-app-planner.png cr128-app-applixware.png cr48-app-vnc.png cr128-app-staroffice.png cr32-app-xcalc.png crsc-app-gnome_apps.svgz cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-gv.png cr32-app-package_games_strategy.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr16-app-gvim.png cr32-app-xfig.png cr16-app-wabi.png cr16-app-linuxconf.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr16-app-lyx.png cr32-app-vnc.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png crsc-app-x.svgz cr32-app-package_edutainment.png crsc-app-camera.svgz cr48-app-randr.png cr16-app-nedit.png cr48-app-abiword.png cr32-app-linuxconf.png cr16-app-gnomemeeting.png cr16-app-xv.png cr32-app-gabber.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr16-app-gv.png cr48-app-netscape.png cr64-app-xmag.png cr16-app-package_development.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr48-app-kvirc.png cr128-app-mozilla.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-gimp.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-kfm_home.png cr32-app-xclock.png cr16-app-vnc.png cr16-app-package_network.png cr32-app-wabi.png cr128-app-clanbomber.png cr48-app-scribus.png cr128-app-tux.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr48-app-package_system.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-email.png cr32-app-package_utilities.png cr16-app-gaim.png cr128-app-xmag.png cr48-app-nedit.png cr128-app-penguin.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr48-app-package_development.png cr32-app-xmms.png cr48-app-package_toys.png crsc-app-wine.svgz cr32-app-xemacs.png cr32-app-abiword.png cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr16-app-xmms.png cr64-app-mozilla.png cr32-app-alevt.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr32-app-nedit.png cr16-app-planner.png cr128-app-netscape.png cr16-app-package.png cr32-app-kvirc.png cr32-app-package_graphics.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png cr48-app-tux.png crsc-app-error.svgz cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr128-app-package_favourite.png cr32-app-xconsole.png cr16-app-bluefish.png crsc-app-package_development.svgz cr64-app-qtella.png crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr64-app-acroread.png cr48-app-package_graphics.png cr32-app-wp.png crsc-app-download_manager.svgz cr16-app-wp.png cr16-app-package_graphics.png cr32-app-firefox.png cr32-app-galeon.png cr16-app-edu_miscellaneous.png cr48-app-dia.png cr16-app-linguist.png cr32-app-plan.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-package_editors.png cr48-app-firefox.png cr128-app-package.png cr48-app-phppg.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr64-app-netscape.png cr48-app-package_games_card.png cr128-app-xclock.png cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr16-app-xload.png
+-KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-xedit.png cr48-app-gaim.png crsc-app-antivirus.svgz cr16-app-assistant.png cr48-app-kbinaryclock.png cr32-app-mozilla.png cr64-app-licq.png cr32-app-xmag.png cr16-app-applixware.png cr48-app-xv.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-linuxconf.png cr48-app-package_settings.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-realplayer.png cr16-app-package_edutainment.png cr128-app-taskbar.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-taskbar.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-mathematica.png cr32-app-gnumeric.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png cr16-app-xfig.png crsc-app-systemtray.svgz cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png crsc-app-kfm_home.svgz cr64-app-linuxconf.png cr32-app-edu_science.png cr16-app-package_wordprocessing.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_utilities.png cr128-app-package_development.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr48-app-galeon.png cr64-app-package_multimedia.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr64-app-phppg.png cr32-app-blender.png cr16-app-sodipodi.png cr32-app-xedit.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz crsc-app-aktion.svgz cr16-app-licq.png cr128-app-pysol.png cr32-app-package_multimedia.png cr16-app-kvirc.png cr16-app-netscape.png cr128-app-linuxconf.png Makefile.in cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr22-app-fifteenpieces.png cr128-app-package_network.png cr32-app-pybliographic.png cr16-app-designer.png cr32-app-eclipse.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-mathematica.png cr16-app-pybliographic.png cr16-app-clanbomber.png cr64-app-kfm_home.png cr22-app-package_development.png crsc-app-terminal.svgz cr32-app-xapp.png cr48-app-licq.png cr16-app-package_applications.png cr48-app-xfmail.png cr64-app-applixware.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png cr64-app-package.png crsc-app-quicktime.svgz cr22-app-kbinaryclock.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr32-app-package_games.png cr32-app-wine.png cr64-app-wp.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png cr32-app-package_games_board.png crsc-app-fifteenpieces.svgz cr64-app-penguin.png cr48-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr16-app-runprocesscatcher.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr32-app-terminal.png cr64-app-taskbar.png cr16-app-package_application.png cr16-app-package_games.png cr64-app-systemtray.png cr48-app-staroffice.png cr16-app-phppg.png cr48-app-gnucash.png crsc-app-xcalc.svgz cr48-app-mozilla.png cr32-app-package_games_arcade.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr32-app-systemtray.png cr48-app-opera.png cr128-app-terminal.png cr16-app-systemtray.png cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-taskbar.png cr32-app-x.png cr48-app-kfm_home.png cr16-app-mozilla.png crsc-app-xclock.svgz cr32-app-clanbomber.png cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr48-app-xemacs.png cr48-app-package.png cr64-app-gimp.png cr48-app-pan.png cr16-app-blender.png cr48-app-pysol.png cr48-app-designer.png cr48-app-systemtray.png cr48-app-package_games_strategy.png cr64-app-randr.png crsc-app-my_mac.svgz cr32-app-xeyes.png cr32-app-acroread.png cr16-app-evolution.png crsc-app-shell.svgz cr48-app-xchat.png cr16-app-acroread.png cr64-app-package_settings.png cr128-app-email.png cr128-app-applixware.png cr48-app-planner.png cr48-app-vnc.png cr128-app-staroffice.png cr32-app-xcalc.png crsc-app-gnome_apps.svgz cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-package_games_strategy.png cr32-app-gv.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr32-app-xfig.png cr16-app-gvim.png cr16-app-linuxconf.png cr16-app-wabi.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr16-app-lyx.png cr32-app-vnc.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png cr32-app-package_edutainment.png crsc-app-x.svgz cr48-app-randr.png crsc-app-camera.svgz cr48-app-abiword.png cr16-app-nedit.png cr32-app-linuxconf.png cr16-app-xv.png cr32-app-gabber.png cr16-app-gnomemeeting.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr48-app-fifteenpieces.png cr16-app-gv.png cr48-app-netscape.png cr16-app-package_development.png cr64-app-xmag.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr128-app-mozilla.png cr48-app-kvirc.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-systemtray.png cr128-app-gimp.png cr16-app-fifteenpieces.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-vnc.png cr16-app-package_network.png cr16-app-kfm_home.png cr32-app-xclock.png cr22-app-taskbar.png cr32-app-wabi.png cr128-app-clanbomber.png cr22-app-systemtray.png cr48-app-scribus.png cr128-app-tux.png cr32-app-kbinaryclock.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr48-app-package_system.png cr22-app-runprocesscatcher.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-runprocesscatcher.png cr32-app-email.png cr32-app-package_utilities.png cr48-app-nedit.png cr128-app-penguin.png cr16-app-gaim.png cr128-app-xmag.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr32-app-xmms.png cr48-app-package_development.png cr48-app-package_toys.png cr32-app-abiword.png cr32-app-xemacs.png crsc-app-wine.svgz cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr32-app-alevt.png cr64-app-mozilla.png cr16-app-xmms.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr16-app-planner.png cr32-app-nedit.png cr128-app-netscape.png cr16-app-package.png cr32-app-kvirc.png cr32-app-package_graphics.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png crsc-app-error.svgz cr48-app-tux.png cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr128-app-package_favourite.png cr32-app-xconsole.png cr16-app-bluefish.png cr64-app-qtella.png crsc-app-package_development.svgz crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr64-app-acroread.png cr16-app-kbinaryclock.png cr48-app-package_graphics.png cr32-app-wp.png crsc-app-download_manager.svgz cr16-app-wp.png cr16-app-package_graphics.png cr32-app-firefox.png cr16-app-edu_miscellaneous.png cr32-app-galeon.png cr48-app-dia.png cr32-app-plan.png cr16-app-linguist.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-package_editors.png cr48-app-firefox.png cr48-app-phppg.png cr128-app-package.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr32-app-fifteenpieces.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr48-app-package_games_card.png cr64-app-netscape.png crsc-app-kbinaryclock.svgz cr128-app-xclock.png cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr48-app-taskbar.png cr16-app-xload.png
++KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-gaim.png cr48-app-xedit.png crsc-app-antivirus.svgz cr16-app-assistant.png cr32-app-mozilla.png cr48-app-kbinaryclock.png cr64-app-licq.png cr48-app-xv.png cr16-app-applixware.png cr32-app-xmag.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-package_settings.png cr48-app-linuxconf.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-package_edutainment.png cr16-app-realplayer.png cr128-app-taskbar.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-taskbar.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-gnumeric.png cr32-app-mathematica.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png crsc-app-systemtray.svgz cr16-app-xfig.png cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png crsc-app-kfm_home.svgz cr64-app-linuxconf.png cr16-app-package_wordprocessing.png cr32-app-edu_science.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_utilities.png cr128-app-package_development.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr48-app-galeon.png cr64-app-package_multimedia.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr32-app-blender.png cr64-app-phppg.png cr32-app-xedit.png cr16-app-sodipodi.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz cr32-app-package_multimedia.png cr128-app-pysol.png cr16-app-licq.png crsc-app-aktion.svgz cr16-app-netscape.png cr16-app-kvirc.png Makefile.in cr128-app-linuxconf.png cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr128-app-package_network.png cr22-app-fifteenpieces.png cr32-app-pybliographic.png cr16-app-designer.png cr32-app-eclipse.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-pybliographic.png cr16-app-mathematica.png cr16-app-clanbomber.png cr22-app-package_development.png crsc-app-terminal.svgz cr64-app-kfm_home.png cr32-app-xapp.png cr48-app-licq.png cr48-app-xfmail.png cr64-app-applixware.png cr16-app-package_applications.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png crsc-app-quicktime.svgz cr64-app-package.png cr22-app-kbinaryclock.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr64-app-wp.png cr32-app-package_games.png cr32-app-wine.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png crsc-app-fifteenpieces.svgz cr32-app-package_games_board.png cr64-app-penguin.png cr48-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr16-app-runprocesscatcher.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr64-app-taskbar.png cr32-app-terminal.png cr16-app-package_application.png cr16-app-package_games.png cr64-app-systemtray.png cr48-app-staroffice.png cr16-app-phppg.png cr48-app-gnucash.png crsc-app-xcalc.svgz cr32-app-package_games_arcade.png cr48-app-mozilla.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr32-app-systemtray.png cr48-app-opera.png cr128-app-terminal.png cr16-app-systemtray.png cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-x.png cr32-app-taskbar.png cr16-app-mozilla.png cr48-app-kfm_home.png cr32-app-clanbomber.png crsc-app-xclock.svgz cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr64-app-gimp.png cr48-app-pan.png cr48-app-xemacs.png cr48-app-package.png cr48-app-pysol.png cr16-app-blender.png cr48-app-designer.png cr48-app-systemtray.png cr64-app-randr.png cr48-app-package_games_strategy.png crsc-app-my_mac.svgz cr32-app-acroread.png cr16-app-evolution.png cr32-app-xeyes.png crsc-app-shell.svgz cr16-app-acroread.png cr48-app-xchat.png cr64-app-package_settings.png cr128-app-email.png cr48-app-planner.png cr128-app-applixware.png cr48-app-vnc.png cr128-app-staroffice.png cr32-app-xcalc.png crsc-app-gnome_apps.svgz cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-gv.png cr32-app-package_games_strategy.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr16-app-gvim.png cr32-app-xfig.png cr16-app-wabi.png cr16-app-linuxconf.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr16-app-lyx.png cr32-app-vnc.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png crsc-app-x.svgz cr32-app-package_edutainment.png crsc-app-camera.svgz cr48-app-randr.png cr16-app-nedit.png cr48-app-abiword.png cr32-app-linuxconf.png cr16-app-gnomemeeting.png cr16-app-xv.png cr32-app-gabber.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr48-app-fifteenpieces.png cr16-app-gv.png cr48-app-netscape.png cr64-app-xmag.png cr16-app-package_development.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr48-app-kvirc.png cr128-app-mozilla.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-systemtray.png cr128-app-gimp.png cr16-app-fifteenpieces.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-kfm_home.png cr32-app-xclock.png cr16-app-vnc.png cr16-app-package_network.png cr32-app-wabi.png cr22-app-taskbar.png cr128-app-clanbomber.png cr22-app-systemtray.png cr48-app-scribus.png cr128-app-tux.png cr32-app-kbinaryclock.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr22-app-runprocesscatcher.png cr48-app-package_system.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-runprocesscatcher.png cr32-app-email.png cr32-app-package_utilities.png cr16-app-gaim.png cr128-app-xmag.png cr48-app-nedit.png cr128-app-penguin.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr48-app-package_development.png cr32-app-xmms.png cr48-app-package_toys.png crsc-app-wine.svgz cr32-app-xemacs.png cr32-app-abiword.png cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr16-app-xmms.png cr64-app-mozilla.png cr32-app-alevt.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr32-app-nedit.png cr16-app-planner.png cr128-app-netscape.png cr16-app-package.png cr32-app-kvirc.png cr32-app-package_graphics.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png cr48-app-tux.png crsc-app-error.svgz cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr128-app-package_favourite.png cr32-app-xconsole.png cr16-app-bluefish.png crsc-app-package_development.svgz cr64-app-qtella.png crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr16-app-kbinaryclock.png cr64-app-acroread.png cr48-app-package_graphics.png cr32-app-wp.png crsc-app-download_manager.svgz cr16-app-wp.png cr16-app-package_graphics.png cr32-app-firefox.png cr32-app-galeon.png cr16-app-edu_miscellaneous.png cr48-app-dia.png cr16-app-linguist.png cr32-app-plan.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-package_editors.png cr48-app-firefox.png cr128-app-package.png cr48-app-phppg.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr32-app-fifteenpieces.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr64-app-netscape.png cr48-app-package_games_card.png cr128-app-xclock.png crsc-app-kbinaryclock.svgz cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr48-app-taskbar.png cr16-app-xload.png
#>+ 2
docs-am:
- #>+ 775
+ #>+ 829
install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/crsc-app-systemtray.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-kbinaryclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
+ $(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
@@ -29755,11 +34471,7 @@
+ $(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
@@ -29775,9 +34487,10 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
+ $(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/cr22-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
$(INSTALL_DATA) $(srcdir)/cr128-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
@@ -29785,12 +34498,12 @@
+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
+ $(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
@@ -29803,11 +34516,13 @@
+ $(INSTALL_DATA) $(srcdir)/cr16-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-xchat.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
+ $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
@@ -29825,7 +34540,8 @@
+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
@@ -29858,10 +34574,13 @@
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
@@ -29878,8 +34597,8 @@
+ $(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
+ $(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
$(INSTALL_DATA) $(srcdir)/cr32-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- $(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
@@ -29902,6 +34621,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
$(INSTALL_DATA) $(srcdir)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
@@ -29921,6 +34641,7 @@
- $(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
@@ -29930,6 +34651,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
$(INSTALL_DATA) $(srcdir)/cr128-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
@@ -29940,6 +34662,7 @@
- $(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
- $(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
@@ -29948,28 +34671,23 @@
- $(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
@@ -29981,6 +34699,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
@@ -29990,98 +34709,50 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-shell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
+ $(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
+ $(INSTALL_DATA) $(srcdir)/crsc-app-kfm_home.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
- $(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
- $(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
- $(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
-- $(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
+ $(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
-- $(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
-- $(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
-- $(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
@@ -30099,42 +34770,19 @@
+ $(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
-- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
-- $(INSTALL_DATA) $(srcdir)/cr48-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
@@ -30143,22 +34791,17 @@
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
@@ -30173,26 +34816,16 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
-- $(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
-- $(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
-- $(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
-- $(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
-- $(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-package_development.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
+ $(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
+ $(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
@@ -30202,23 +34835,38 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-kbinaryclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
+ $(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
@@ -30227,19 +34875,146 @@
+ $(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-fifteenpieces.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
@@ -30260,34 +35035,19 @@
- $(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
- $(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-package_development.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
- $(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
@@ -30300,7 +35060,7 @@
- $(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
@@ -30308,22 +35068,14 @@
- $(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
-- $(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
$(INSTALL_DATA) $(srcdir)/cr32-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
@@ -30338,14 +35090,15 @@
- $(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
$(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
@@ -30358,11 +35111,13 @@
- $(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-fifteenpieces.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
@@ -30378,13 +35133,26 @@
$(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-systemtray.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
-- $(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
@@ -30394,25 +35162,17 @@
- $(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
- $(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
$(INSTALL_DATA) $(srcdir)/cr16-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
@@ -30429,13 +35189,15 @@
$(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
-- $(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
+ $(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
@@ -30452,6 +35214,7 @@
+ $(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
+ $(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
@@ -30462,12 +35225,12 @@
$(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
- $(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
- $(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
- $(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
-- $(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
- $(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
-- $(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
- $(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
- $(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
@@ -30478,16 +35241,23 @@
- $(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
++ $(INSTALL_DATA) $(srcdir)/cr128-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
@@ -30508,6 +35278,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
@@ -30521,6 +35292,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
@@ -30528,17 +35300,18 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
@@ -30549,8 +35322,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
@@ -30589,10 +35361,13 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
@@ -30610,14 +35385,31 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
@@ -30636,12 +35428,19 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
@@ -30650,6 +35449,7 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
@@ -30658,6 +35458,7 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
@@ -30667,31 +35468,11 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
@@ -30714,6 +35495,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
@@ -30723,6 +35505,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
@@ -30731,6 +35514,7 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
@@ -30738,16 +35522,20 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
@@ -30808,6 +35596,7 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
@@ -30832,12 +35621,14 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
@@ -30852,8 +35643,8 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
@@ -30861,6 +35652,8 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
@@ -30876,6 +35669,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
@@ -30887,6 +35681,7 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
@@ -30923,9 +35718,11 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
@@ -30935,6 +35732,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
@@ -30945,6 +35743,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
@@ -30960,6 +35759,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
@@ -30993,8 +35793,9 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
@@ -31007,6 +35808,7 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
@@ -31021,6 +35823,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
@@ -31041,11 +35844,11 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
@@ -31057,6 +35860,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
@@ -31071,14 +35875,15 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
@@ -31091,11 +35896,13 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
@@ -31118,6 +35925,8 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
@@ -31127,8 +35936,8 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
@@ -31138,11 +35947,15 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
@@ -31161,13 +35974,15 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
@@ -31184,6 +35999,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
@@ -31194,12 +36010,12 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
@@ -31210,6 +36026,7 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
@@ -31217,7 +36034,7 @@
force-reedit:
--- pics/hicolor/Makefile.in
+++ pics/hicolor/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31227,7 +36044,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -31236,7 +36053,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31250,7 +36067,7 @@
mostlyclean-libtool:
--- pics/Makefile.in
+++ pics/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31260,7 +36077,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -31269,7 +36086,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31283,7 +36100,7 @@
mostlyclean-libtool:
--- pics/wallpapers/Makefile.in
+++ pics/wallpapers/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -260,6 +260,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31293,7 +36110,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -603,7 +606,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -31302,7 +36119,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31314,12 +36131,3 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -801,7 +804,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Paper01.jpg andes-venezolanos.svgz All-Good-People-1.jpg.desktop gear-flowers.svgz.desktop Won-Ton-Soup-3.jpg lineart.svgz CREDITS Island-of-Elba.jpg konqui.svgz moon.svgz.desktop fulmine.jpg.desktop triplegears.jpg Time-For-Lunch-2.jpg Blkmarble.jpg.desktop seaofconero.jpg Makefile.in triplegears.jpg.desktop celtic.svgz.desktop gear-flowers.svgz Paper01.jpg.desktop andes-venezolanos.svgz.desktop aurora.svgz.desktop Totally-New-Product-1.jpg globe.svgz.desktop Marble01.jpg.desktop default_gears.jpg.desktop Blkmarble.jpg Chicken-Songs-2.jpg.desktop Planning-And-Probing-1.jpg.desktop default_gears.jpg only_k.jpg.desktop Time-For-Lunch-2.jpg.desktop kde_box.png.desktop fulmine.jpg here-gear.svgz blue-bend.jpg Won-Ton-Soup-3.jpg.desktop Marble01.jpg No-Ones-Laughing-3.jpg.desktop Foggy1.jpg Circuit.jpg.desktop celtic.svgz default_blue.jpg moon.svgz blue-bend.jpg.desktop Foggy1.jpg.desktop konqui.svgz.desktop default_blue.jpg.desktop seaofconero.jpg.desktop KDE34.png only_k.jpg aurora.svgz kde_passion.jpg globe.svgz Island-of-Elba.jpg.desktop All-Good-People-1.jpg Chicken-Songs-2.jpg Planning-And-Probing-1.jpg here-gear.svgz.desktop kde_box.png lineart.svgz.desktop Totally-New-Product-1.jpg.desktop No-Ones-Laughing-3.jpg kde_passion.jpg.desktop Circuit.jpg Makefile.am KDE34.png.desktop
-+KDE_DIST=Paper01.jpg andes-venezolanos.svgz All-Good-People-1.jpg.desktop gear-flowers.svgz.desktop Won-Ton-Soup-3.jpg lineart.svgz CREDITS Island-of-Elba.jpg konqui.svgz moon.svgz.desktop fulmine.jpg.desktop triplegears.jpg Time-For-Lunch-2.jpg Blkmarble.jpg.desktop seaofconero.jpg Makefile.in triplegears.jpg.desktop celtic.svgz.desktop gear-flowers.svgz Paper01.jpg.desktop andes-venezolanos.svgz.desktop aurora.svgz.desktop Totally-New-Product-1.jpg Marble01.jpg.desktop globe.svgz.desktop default_gears.jpg.desktop Blkmarble.jpg Chicken-Songs-2.jpg.desktop Planning-And-Probing-1.jpg.desktop only_k.jpg.desktop default_gears.jpg Time-For-Lunch-2.jpg.desktop kde_box.png.desktop fulmine.jpg here-gear.svgz blue-bend.jpg Won-Ton-Soup-3.jpg.desktop Marble01.jpg No-Ones-Laughing-3.jpg.desktop Foggy1.jpg Circuit.jpg.desktop celtic.svgz default_blue.jpg moon.svgz blue-bend.jpg.desktop Foggy1.jpg.desktop konqui.svgz.desktop default_blue.jpg.desktop seaofconero.jpg.desktop KDE34.png only_k.jpg aurora.svgz kde_passion.jpg globe.svgz Island-of-Elba.jpg.desktop All-Good-People-1.jpg Chicken-Songs-2.jpg Planning-And-Probing-1.jpg here-gear.svgz.desktop kde_box.png lineart.svgz.desktop Totally-New-Product-1.jpg.desktop No-Ones-Laughing-3.jpg kde_passion.jpg.desktop Circuit.jpg Makefile.am KDE34.png.desktop
-
- #>+ 2
- docs-am:
More information about the pkg-kde-commits
mailing list