[Pkg-kde-commits] rev 663 - branches/kde-3.4.0/packages/kdebase/debian/patches

Christopher Martin chrsmrtn-guest@costa.debian.org
Sat, 05 Mar 2005 03:44:28 +0100


Author: chrsmrtn-guest
Date: 2005-03-05 03:44:18 +0100 (Sat, 05 Mar 2005)
New Revision: 663

Added:
   branches/kde-3.4.0/packages/kdebase/debian/patches/99_buildprep.diff
Log:
kdebase's buildprep.diff.


Added: branches/kde-3.4.0/packages/kdebase/debian/patches/99_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/99_buildprep.diff	2005-03-05 01:32:53 UTC (rev 662)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/99_buildprep.diff	2005-03-05 02:44:18 UTC (rev 663)
@@ -0,0 +1,48742 @@
+#DPATCHLEVEL=1
+diff -Nrua kdebase-3.4.0.orig/Makefile.in kdebase-3.4.0/Makefile.in
+--- kdebase-3.4.0.orig/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/Makefile.in	2005-03-04 19:44:14.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -273,6 +273,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@
+@@ -572,7 +575,7 @@
+ .SUFFIXES:
+ am--refresh:
+ 	@:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -614,12 +617,12 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ #>- 	cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ 	cd $(srcdir) && rm -f configure
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 
+ config.h: stamp-h1
+@@ -631,7 +634,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in:  $(am__configure_deps) 
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+ 	cd $(top_srcdir) && $(AUTOHEADER)
+ 	rm -f stamp-h1
+ 	touch $@
+@@ -675,7 +678,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -687,7 +696,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -695,7 +704,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -716,7 +731,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1239,7 +1254,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=startkde subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in kdebase.lsm 
++KDE_DIST=startkde stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in kdebase.lsm 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/acinclude.m4 kdebase-3.4.0/acinclude.m4
+--- kdebase-3.4.0.orig/acinclude.m4	2005-03-04 08:11:03.000000000 -0500
++++ kdebase-3.4.0/acinclude.m4	2005-03-04 19:36:03.000000000 -0500
+@@ -1682,15 +1682,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)
+@@ -2131,9 +2122,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
+@@ -5686,6 +5674,7 @@
+ ## the same distribution terms that you use for the rest of that program.
+ 
+ # serial 47 AC_PROG_LIBTOOL
++# Debian $Rev: 214 $
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -5745,7 +5734,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Prevent multiple expansion
+@@ -6159,12 +6148,11 @@
+   if AC_TRY_EVAL(ac_compile); then
+     case "`/usr/bin/file conftest.o`" in
+     *32-bit*)
+-      LINUX_64_MODE="32"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -6176,7 +6164,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -6306,7 +6293,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+   i=0
+-  testring="ABCD"
++  teststring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -6335,20 +6322,26 @@
+     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;
++    ;;
++
+  *)
+     # 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` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
++      teststring=$teststring$teststring
+     done
+-    testring=
++    teststring=
+     # 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.
+@@ -6498,7 +6491,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -6587,13 +6580,6 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    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.
+@@ -6617,8 +6603,11 @@
+      fi
+    fi
+    chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
+    cd ..
+    rmdir conftest
+    $rm conftest*
+@@ -6735,7 +6724,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
++  esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -6748,7 +6737,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -6758,7 +6747,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -6823,7 +6825,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+@@ -6848,7 +6850,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -6913,7 +6915,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)'
+   # 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"`
+@@ -6936,7 +6938,7 @@
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*-gnu*)
++kfreebsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -6996,7 +6998,7 @@
+   need_version=no
+   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
+@@ -7011,7 +7013,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -7022,7 +7024,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -7084,22 +7086,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'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # 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' ' '`
++    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,
+@@ -7109,6 +7108,30 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -7118,7 +7141,7 @@
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -7147,7 +7170,7 @@
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+-  need_version=no
++  need_version=yes
+   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
+@@ -7167,7 +7190,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -7758,31 +7781,23 @@
+   ;;
+ 
+ cygwin*)
+-  lt_cv_deplibs_check_method=pass_all
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+-  
++
+ mingw* | pw32*)
+-  # win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='win32_libid'
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
+   ;;
+ 
+ darwin* | rhapsody*)
+-  # this will be overwritten by pass_all, but leave it in just in case
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[[012]])
+-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd*)
++freebsd* | kfreebsd*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+@@ -7821,42 +7836,21 @@
+   ;;
+ 
+ irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+-    ;;
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+ linux*)
+-  case $host_cpu in
+-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+-  arm* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+   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
+@@ -7885,9 +7879,6 @@
+   ;;
+ 
+ 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'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -7897,7 +7888,6 @@
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -8163,7 +8153,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])
+-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
++  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
+   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
+@@ -8213,7 +8203,7 @@
+   fi
+   ;;
+ 
+-aix4*)
++aix4* | aix5*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+@@ -8223,29 +8213,29 @@
+     _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
+-	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
++        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'
+-    _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
+-    _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
+@@ -8253,8 +8243,8 @@
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+   else
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi  
+-    ;;  
++  fi
++    ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+@@ -8362,8 +8352,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
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $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 -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $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'
+@@ -8389,7 +8379,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.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+@@ -8419,8 +8409,22 @@
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+     else
+-      # KDE requires run time linking.  Make it the default.
+-      aix_use_runtimelinking=yes
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++      esac
++
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+     fi
+@@ -8466,15 +8470,16 @@
+ 	shared_flag='-G'
+       else
+ 	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='-qmkshrobj ${wl}-G'
++	  shared_flag='${wl}-G'
+ 	else
+-	  shared_flag='-qmkshrobj'
++	  shared_flag='${wl}-bM:SRE'
+ 	fi
+       fi
+     fi
+ 
+-    # Let the compiler handle the export list.
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+     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.
+@@ -8483,13 +8488,12 @@
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+       if test "$host_cpu" = ia64; then
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+       else
+ 	# Determine the default libpath from the value encoded in an empty executable.
+ 	_LT_AC_SYS_LIBPATH_AIX
+@@ -8504,7 +8508,7 @@
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 	# This is similar to how AIX traditionally builds it's shared libraries.
+-	_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'
++	_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
+     ;;
+@@ -8521,12 +8525,12 @@
+     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+     # as there is no search path for DLLs.
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++    _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
+ 
+     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+       # 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
+@@ -8535,7 +8539,7 @@
+ 	echo EXPORTS > $output_objdir/$soname.def;
+ 	cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+     else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     fi
+@@ -8546,20 +8550,20 @@
+     _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
+-	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
++        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
+@@ -8569,19 +8573,19 @@
+       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
+-      _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
+-    _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
+-      _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
+-      _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
+-    _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
+@@ -8616,7 +8620,7 @@
+   freebsd-elf*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+-  freebsd*)
++  freebsd* | kfreebsd*-gnu)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -8638,7 +8642,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+     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'
++      _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.
+@@ -8647,11 +8651,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'
+       ;;
+     *)
+       if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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'
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -8708,7 +8712,7 @@
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	esac
+ 	# Commands to make compiler produce verbose output that lists
+@@ -8729,7 +8733,7 @@
+ 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	      ;;
+ 	    *)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    esac
+ 	  fi
+@@ -8744,7 +8748,7 @@
+     case $cc_basename in
+       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'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+@@ -8755,9 +8759,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'
+ 	  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
+@@ -8774,8 +8778,8 @@
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+@@ -8797,16 +8801,16 @@
+ 	# Intel C++
+ 	with_gnu_ld=yes
+ 	_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)
+ 	# 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'
++	_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  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+ 	runpath_var=LD_RUN_PATH
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -8844,7 +8848,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+     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=
+@@ -8863,7 +8867,7 @@
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -8880,7 +8884,7 @@
+ 	;;
+       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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -8898,7 +8902,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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -8923,7 +8927,7 @@
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -8939,10 +8943,10 @@
+ 	;;
+       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_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~
+ 	  $rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -8961,7 +8965,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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -9018,9 +9022,9 @@
+       CC)
+ 	# Sun C++ 4.2, 5.x and Centerline C++
+ 	_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_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'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -9054,7 +9058,7 @@
+ 	;;
+       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'
+@@ -9064,9 +9068,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
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _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 -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -9075,9 +9079,9 @@
+ 	  else
+ 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _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 -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -9245,7 +9249,7 @@
+        fi
+        ;;
+ 
+-    *.$objext|*.$libext)
++    *.$objext)
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+        if test "$p" = "conftest.$objext"; then
+@@ -9354,7 +9358,7 @@
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+-aix4*)
++aix4* | aix5*)
+   test "$enable_shared" = yes && enable_static=no
+   ;;
+ esac
+@@ -9496,11 +9500,12 @@
+   # without removal of \ escapes.
+   if test -n "${ZSH_VERSION+set}" ; then
+     setopt NO_GLOB_SUBST
+-  fi  
++  fi
+   # 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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
+     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 \
+@@ -9550,7 +9555,7 @@
+     _LT_AC_TAGVAR(archive_cmds, $1) | \
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+     extract_expsyms_cmds | reload_cmds | finish_cmds | \
+@@ -9681,7 +9686,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -9712,7 +9717,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -9956,7 +9961,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.
+-  test -f Makefile && make "$ltmain"
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ ])# AC_LIBTOOL_CONFIG
+ 
+@@ -10029,7 +10037,7 @@
+   symcode='[[BCDEGQRST]]'
+   ;;
+ solaris* | sysv5*)
+-  symcode='[[BDT]]'
++  symcode='[[BDRT]]'
+   ;;
+ sysv4)
+   symcode='[[DFNSTU]]'
+@@ -10047,7 +10055,7 @@
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+-  symcode='[[ABCDGISTW]]' ;;
++  symcode='[[ABCDGIRSTW]]' ;;
+ esac
+ 
+ # Try without a prefix undercore, then with it.
+@@ -10262,7 +10270,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd*)
++      freebsd* | kfreebsd*-gnu)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -10313,7 +10321,7 @@
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-	    ;; 
++	    ;;
+ 	  cxx)
+ 	    # Compaq C++
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -10338,7 +10346,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -10649,6 +10657,9 @@
+   cygwin* | mingw*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
++  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'
+   ;;
+@@ -10673,7 +10684,7 @@
+   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+   _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+   _LT_AC_TAGVAR(module_cmds, $1)=
+-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
++  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+   _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*
+@@ -10747,7 +10758,7 @@
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -10757,13 +10768,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'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _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'
+ 
+       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'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ 	# 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
+@@ -10772,19 +10783,19 @@
+ 	  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
+       fi
+       ;;
+ 
+-    netbsd*)
++    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'
+ 	wlarc=
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+@@ -10802,8 +10813,8 @@
+ 
+ EOF
+       elif $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'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -10816,10 +10827,36 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
++  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'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -10869,9 +10906,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
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+@@ -10917,29 +10965,29 @@
+ 	  shared_flag='-G'
+ 	else
+   	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
++	    shared_flag='${wl}-bM:SRE'
+   	fi
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+       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.
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	_LT_AC_SYS_LIBPATH_AIX
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       _LT_AC_SYS_LIBPATH_AIX
++       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 _LT_AC_SYS_LIBPATH_AIX
+@@ -10954,7 +11002,7 @@
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  _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'
++	  _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
+       ;;
+@@ -10977,13 +11025,13 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # 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.
+@@ -10997,21 +11045,21 @@
+       _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'
+-	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
++      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
+ 	;;
+       esac
+     	lt_int_apple_cc_single_mod=no
+@@ -11020,26 +11068,26 @@
+     	  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
+-        _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
+-      _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
+-          _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
+-          _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
+-          _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
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    else  
++    else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi  
++    fi
+       ;;
+ 
+     dgux*)
+@@ -11072,8 +11120,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++    freebsd* | kfreebsd*-gnu)
++      _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
+@@ -11081,7 +11129,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       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
+@@ -11099,10 +11147,10 @@
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ 	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'
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+@@ -11149,7 +11197,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${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(archive_cmds, $1)='$CC -shared $libobjs $deplibs $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)='$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'
+@@ -11159,7 +11207,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       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
+@@ -11182,7 +11230,7 @@
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+@@ -11192,7 +11240,7 @@
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   _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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -11203,14 +11251,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
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${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(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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(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'
+@@ -11222,7 +11270,7 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${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(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+@@ -11247,9 +11295,9 @@
+     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'
++	_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
+ 	_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~
+@@ -11269,7 +11317,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.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -11329,9 +11377,9 @@
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	_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'
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+       runpath_var='LD_RUN_PATH'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -11389,7 +11437,7 @@
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-  
++
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+@@ -11548,8 +11596,8 @@
+     fi
+   done
+ done
+-])
+ SED=$lt_cv_path_SED
++])
+ AC_MSG_RESULT([$SED])
+ ])
+ 
+diff -Nrua kdebase-3.4.0.orig/aclocal.m4 kdebase-3.4.0/aclocal.m4
+--- kdebase-3.4.0.orig/aclocal.m4	2005-03-04 08:11:28.000000000 -0500
++++ kdebase-3.4.0/aclocal.m4	2005-03-04 19:36:43.000000000 -0500
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+ 
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005  Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,23 +11,11 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-#                                                        -*- Autoconf -*-
+-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+-# Generated from amversion.in; do not edit by hand.
+-
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
++# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+@@ -40,26 +28,15 @@
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-	 [AM_AUTOMAKE_VERSION([1.9.1])])
+-
+-# AM_AUX_DIR_EXPAND
++	 [AM_AUTOMAKE_VERSION([1.9.5])])
+ 
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
++# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+ # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+@@ -106,26 +83,16 @@
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ ])
+ 
+-# AM_CONDITIONAL                                              -*- Autoconf -*-
+-
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
++# AM_CONDITIONAL                                            -*- Autoconf -*-
+ 
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 6
++# serial 7
+ 
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -149,26 +116,15 @@
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+ 
+-# serial 7						-*- Autoconf -*-
+ 
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
++# serial 8
+ 
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -177,7 +133,6 @@
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ 
+ 
+-
+ # _AM_DEPENDENCIES(NAME)
+ # ----------------------
+ # See how the compiler implements dependency checking.
+@@ -317,27 +272,16 @@
+ AC_SUBST([AMDEPBACKSLASH])
+ ])
+ 
+-# Generate code to set up dependency tracking.   -*- Autoconf -*-
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+-#   Free Software Foundation, Inc.
++# Generate code to set up dependency tracking.              -*- Autoconf -*-
+ 
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-#serial 2
++#serial 3
+ 
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+@@ -396,54 +340,31 @@
+      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+ ])
+ 
+-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+-
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+-
+-# 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, or (at your option)
+-# any later version.
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# serial 7
++# serial 8
+ 
+ # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+ 
+-# Do all the work for Automake.                            -*- Autoconf -*-
+-
+-# This macro actually does too much some checks are only needed if
+-# your package does certain things.  But this isn't really a big deal.
++# Do all the work for Automake.                             -*- Autoconf -*-
+ 
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# serial 12
+ 
+-# serial 11
++# This macro actually does too much.  Some checks are only needed if
++# your package does certain things.  But this isn't really a big deal.
+ 
+ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+ # AM_INIT_AUTOMAKE([OPTIONS])
+@@ -545,51 +466,27 @@
+ done
+ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+ 
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
+ # AM_PROG_INSTALL_SH
+ # ------------------
+ # Define $install_sh.
+-
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+-
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ install_sh=${install_sh-"$am_aux_dir/install-sh"}
+ AC_SUBST(install_sh)])
+ 
+-#                                                          -*- Autoconf -*-
+-# Copyright (C) 2003  Free Software Foundation, Inc.
+-
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 1
++# serial 2
+ 
+ # Check whether the underlying file-system supports filenames
+ # with a leading dot.  For instance MS-DOS doesn't.
+@@ -604,26 +501,44 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+ 
+-# Check to see how 'make' treats includes.	-*- Autoconf -*-
++# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
++# From Jim Meyering
+ 
+-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# 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, or (at your option)
+-# any later version.
++# serial 4
+ 
+-# 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode is disabled by default
++  AC_ARG_ENABLE(maintainer-mode,
++[  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer],
++      USE_MAINTAINER_MODE=$enableval,
++      USE_MAINTAINER_MODE=no)
++  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST(MAINT)dnl
++]
++)
+ 
+-# serial 2
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
++# Check to see how 'make' treats includes.	            -*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 3
+ 
+ # AM_MAKE_INCLUDE()
+ # -----------------
+@@ -667,27 +582,16 @@
+ rm -f confinc confmf
+ ])
+ 
+-#  -*- Autoconf -*-
++# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+ 
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+-
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# serial 3
++# serial 4
+ 
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -713,27 +617,16 @@
+ fi
+ ])
+ 
++# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
+ # AM_PROG_MKDIR_P
+ # ---------------
+ # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+-
+-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+-
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
++#
+ # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+ # created by `make install' are always world readable, even if the
+ # installer happens to have an overly restrictive umask (e.g. 077).
+@@ -787,26 +680,15 @@
+ fi
+ AC_SUBST([mkdir_p])])
+ 
+-# Helper functions for option handling.                    -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+-
+-# 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, or (at your option)
+-# any later version.
++# Helper functions for option handling.                     -*- Autoconf -*-
+ 
+-# 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 2
++# serial 3
+ 
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -831,28 +713,16 @@
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+ 
+-#
+-# Check to make sure that the build environment is sane.
+-#
+-
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
++# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+ 
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 3
++# serial 4
+ 
+ # AM_SANITY_CHECK
+ # ---------------
+@@ -895,25 +765,14 @@
+ fi
+ AC_MSG_RESULT(yes)])
+ 
+-# AM_PROG_INSTALL_STRIP
+-
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+-
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
++# AM_PROG_INSTALL_STRIP
++# ---------------------
+ # One issue with vendor `install' (even GNU) is that you can't
+ # specify the program used to strip binaries.  This is especially
+ # annoying in cross-compiling environments, where the build's strip
+@@ -936,25 +795,13 @@
+ 
+ # Check how to create a tarball.                            -*- Autoconf -*-
+ 
+-# Copyright (C) 2004  Free Software Foundation, Inc.
+-
+-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# serial 1
++# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
++# serial 2
+ 
+ # _AM_PROG_TAR(FORMAT)
+ # --------------------
+diff -Nrua kdebase-3.4.0.orig/applnk/Makefile.in kdebase-3.4.0/applnk/Makefile.in
+--- kdebase-3.4.0.orig/applnk/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/applnk/Makefile.in	2005-03-04 19:44:14.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -264,6 +264,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@
+@@ -597,7 +600,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*) \
+@@ -635,9 +638,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:
+@@ -708,7 +711,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -720,7 +729,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -728,7 +737,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -749,7 +764,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -988,7 +1003,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-settings-accessibility.directory kde-games.directory kde-games-arcade.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-games-board.directory kde-essential.menu kde-office.directory kde-information.menu 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-settings.directory kde-science.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 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/applnk/compat/Makefile.in kdebase-3.4.0/applnk/compat/Makefile.in
+--- kdebase-3.4.0.orig/applnk/compat/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/applnk/compat/Makefile.in	2005-03-04 19:44:14.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -247,6 +247,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-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*) \
+@@ -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:
+diff -Nrua kdebase-3.4.0.orig/configure kdebase-3.4.0/configure
+--- kdebase-3.4.0.orig/configure	2005-03-04 08:15:11.000000000 -0500
++++ kdebase-3.4.0/configure	2005-03-04 19:45:06.000000000 -0500
+@@ -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_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup KDE_BINDIR LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_KVM SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE HAL_INCS HAL_LIBS DBUS_INCS DBUS_LIBS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_halbackend_TRUE include_media_halbackend_FALSE include_kioslave_smb_TRUE include_kioslave_smb_FALSE SMBCLIENT_EXTRA_LIBS LIBART_LIBS LIBART_CFLAGS LIBART_RPATH PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIBHOSTS include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup KDE_BINDIR LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_KVM SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE HAL_INCS HAL_LIBS DBUS_INCS DBUS_LIBS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_halbackend_TRUE include_media_halbackend_FALSE include_kioslave_smb_TRUE include_kioslave_smb_FALSE SMBCLIENT_EXTRA_LIBS LIBART_LIBS LIBART_CFLAGS LIBART_RPATH PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIBHOSTS include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -1025,6 +1025,8 @@
+ Optional Features:
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer
+   --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 @@
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi
+-    cd $ac_popdir
++    cd "$ac_popdir"
+   done
+ fi
+ 
+@@ -2105,6 +2107,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.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval="$enable_maintainer_mode"
++  USE_MAINTAINER_MODE=$enableval
++else
++  USE_MAINTAINER_MODE=no
++fi;
++  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++
++
++if test $USE_MAINTAINER_MODE = yes; then
++  MAINTAINER_MODE_TRUE=
++  MAINTAINER_MODE_FALSE='#'
++else
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
++
++  MAINT=$MAINTAINER_MODE_TRUE
++
++
++
+ 
+   unset CDPATH
+ 
+@@ -3038,8 +3065,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=$?
+@@ -3097,8 +3123,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=$?
+@@ -3214,8 +3239,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=$?
+@@ -3269,8 +3293,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=$?
+@@ -3315,8 +3338,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=$?
+@@ -3360,8 +3382,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=$?
+@@ -3918,8 +3939,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=$?
+@@ -3977,8 +3997,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=$?
+@@ -4049,8 +4068,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=$?
+@@ -4094,8 +4112,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=$?
+@@ -4296,8 +4313,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=$?
+@@ -4385,8 +4401,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=$?
+@@ -4488,8 +4503,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=$?
+@@ -4588,8 +4602,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=$?
+@@ -4673,8 +4686,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=$?
+@@ -4763,8 +4775,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=$?
+@@ -4851,8 +4862,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=$?
+@@ -4939,8 +4949,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=$?
+@@ -5046,8 +5055,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=$?
+@@ -5134,8 +5142,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=$?
+@@ -5222,8 +5229,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=$?
+@@ -5310,8 +5316,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=$?
+@@ -5442,8 +5447,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=$?
+@@ -5531,8 +5535,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=$?
+@@ -5619,8 +5622,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=$?
+@@ -5707,8 +5709,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=$?
+@@ -5795,8 +5796,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=$?
+@@ -5883,8 +5883,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=$?
+@@ -6307,8 +6306,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=$?
+@@ -6434,8 +6432,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=$?
+@@ -6523,8 +6520,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=$?
+@@ -6607,185 +6603,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in
+-         *-*-linux-gnu)
+-
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
+-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-
+-
+-   ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-
+-
+-  save_CXXFLAGS="$CXXFLAGS"
+-  CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+- return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "kde_cv_prog_cxx_$kde_cache=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  CXXFLAGS="$save_CXXFLAGS"
+-  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
+-
+-
+-fi
+-
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+-
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
+-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-
+-
+-   ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-
+-
+-  save_CXXFLAGS="$CXXFLAGS"
+-  CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+- return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "kde_cv_prog_cxx_$kde_cache=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  CXXFLAGS="$save_CXXFLAGS"
+-  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
+-
+-
+-fi
+-
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+- KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- :
+- KDE_NO_UNDEFINED=""
+-fi
+-
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- :
+- KDE_NO_UNDEFINED=""
+-fi
+-
+-           ;;
+-       esac
+   fi
+ 
+ 
+@@ -6974,10 +6791,10 @@
+     fi
+   done
+ done
++SED=$lt_cv_path_SED
+ 
+ fi
+ 
+-SED=$lt_cv_path_SED
+ echo "$as_me:$LINENO: result: $SED" >&5
+ echo "${ECHO_T}$SED" >&6
+ 
+@@ -7211,31 +7028,23 @@
+   ;;
+ 
+ cygwin*)
+-  lt_cv_deplibs_check_method=pass_all
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+ 
+ mingw* | pw32*)
+-  # win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='win32_libid'
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
+   ;;
+ 
+ darwin* | rhapsody*)
+-  # this will be overwritten by pass_all, but leave it in just in case
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[012])
+-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd*)
++freebsd* | kfreebsd*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+@@ -7274,42 +7083,21 @@
+   ;;
+ 
+ irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+-    ;;
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+ linux*)
+-  case $host_cpu in
+-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+-  arm* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+   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
+@@ -7338,9 +7126,6 @@
+   ;;
+ 
+ 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'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -7350,7 +7135,6 @@
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -7427,7 +7211,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 7430 "configure"' > conftest.$ac_ext
++  echo '#line 7214 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -7472,12 +7256,11 @@
+   (exit $ac_status); }; then
+     case "`/usr/bin/file conftest.o`" in
+     *32-bit*)
+-      LINUX_64_MODE="32"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+-        ppc64-*linux*)
++        ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+@@ -7489,7 +7272,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -7549,8 +7331,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=$?
+@@ -7625,8 +7406,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=$?
+@@ -7796,8 +7576,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=$?
+@@ -7864,8 +7643,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=$?
+@@ -8072,7 +7850,7 @@
+ 
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:8075:" \
++echo "$as_me:7853:" \
+      "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
+@@ -8118,8 +7896,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8168,8 +7945,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8227,7 +8003,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+     i=0
+-  testring="ABCD"
++  teststring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -8256,20 +8032,26 @@
+     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;
++    ;;
++
+  *)
+     # 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` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
++      teststring=$teststring$teststring
+     done
+-    testring=
++    teststring=
+     # 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.
+@@ -8337,7 +8119,7 @@
+   symcode='[BCDEGQRST]'
+   ;;
+ solaris* | sysv5*)
+-  symcode='[BDT]'
++  symcode='[BDRT]'
+   ;;
+ sysv4)
+   symcode='[DFNSTU]'
+@@ -8355,7 +8137,7 @@
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+-  symcode='[ABCDGISTW]' ;;
++  symcode='[ABCDGIRSTW]' ;;
+ esac
+ 
+ # Try without a prefix undercore, then with it.
+@@ -9104,11 +8886,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9107: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8889: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9111: \$? = $ac_status" >&5
++   echo "$as_me:8893: \$? = $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
+@@ -9337,11 +9119,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9340: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9122: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9344: \$? = $ac_status" >&5
++   echo "$as_me:9126: \$? = $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
+@@ -9388,13 +9170,6 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    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.
+@@ -9404,11 +9179,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9407: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9182: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:9411: \$? = $ac_status" >&5
++   echo "$as_me:9186: \$? = $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
+@@ -9418,8 +9193,11 @@
+      fi
+    fi
+    chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
+    cd ..
+    rmdir conftest
+    $rm conftest*
+@@ -9547,7 +9325,7 @@
+ 	allow_undefined_flag=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	ld_shlibs=no
+       fi
+@@ -9557,13 +9335,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'
+-      allow_undefined_flag=no
++      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'
+ 
+       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'
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ 	# 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
+@@ -9572,19 +9350,19 @@
+ 	  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
+       fi
+       ;;
+ 
+-    netbsd*)
++    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'
+ 	wlarc=
+       else
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+@@ -9602,8 +9380,8 @@
+ 
+ EOF
+       elif $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'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs=no
+       fi
+@@ -9616,10 +9394,36 @@
+       hardcode_shlibpath_var=no
+       ;;
+ 
++  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'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs=no
+       fi
+@@ -9669,9 +9473,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
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+@@ -9717,21 +9532,22 @@
+ 	  shared_flag='-G'
+ 	else
+   	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
++	    shared_flag='${wl}-bM:SRE'
+   	fi
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      always_export_symbols=no
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols=yes
+       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.
+ 	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
++       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9755,8 +9571,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=$?
+@@ -9783,14 +9598,13 @@
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ 	  allow_undefined_flag="-z nodefs"
+-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 cat >conftest.$ac_ext <<_ACEOF
+@@ -9817,8 +9631,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=$?
+@@ -9856,7 +9669,7 @@
+ 	  whole_archive_flag_spec=' '
+ 	  archive_cmds_need_lc=yes
+ 	  # 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'
++	  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
+       ;;
+@@ -9879,13 +9692,13 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       hardcode_libdir_flag_spec=' '
+-      allow_undefined_flag=no
++      allow_undefined_flag=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+-      archive_cmds='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # 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.
+@@ -9899,21 +9712,21 @@
+       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
+-	  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
++      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
+ 	;;
+       esac
+     	lt_int_apple_cc_single_mod=no
+@@ -9922,18 +9735,18 @@
+     	  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
+-        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
+-      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
+-          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
+-          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
+-          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}'
+       hardcode_direct=no
+       hardcode_automatic=yes
+       hardcode_shlibpath_var=unsupported
+@@ -9974,8 +9787,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd*)
+-      archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+@@ -9983,7 +9796,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       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
+@@ -10001,10 +9814,10 @@
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ 	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'
+ 	  ;;
+ 	*)
+-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+@@ -10051,7 +9864,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	archive_cmds='$CC -shared $libobjs $deplibs $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='$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'
+@@ -10061,7 +9874,7 @@
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -10084,7 +9897,7 @@
+       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'
+ 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ 	export_dynamic_flag_spec='${wl}-E'
+       else
+@@ -10094,7 +9907,7 @@
+ 	   hardcode_libdir_flag_spec='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
++	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -10105,14 +9918,14 @@
+       hardcode_libdir_flag_spec='-L$libdir'
+       hardcode_minus_L=yes
+       allow_undefined_flag=unsupported
+-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+       old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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
+ 	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'
+@@ -10124,7 +9937,7 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${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'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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='${wl}-rpath ${wl}$libdir'
+       else
+ 	allow_undefined_flag=' -expect_unresolved \*'
+@@ -10149,9 +9962,9 @@
+     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'
++	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
+ 	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~
+@@ -10171,7 +9984,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.
+-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -10231,9 +10044,9 @@
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+       no_undefined_flag='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	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'
+       else
+-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+       runpath_var='LD_RUN_PATH'
+       hardcode_shlibpath_var=no
+@@ -10339,7 +10152,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -10349,7 +10162,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -10414,7 +10240,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+@@ -10439,7 +10265,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -10504,7 +10330,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)'
+   # 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"`
+@@ -10527,7 +10353,7 @@
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*-gnu*)
++kfreebsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -10587,7 +10413,7 @@
+   need_version=no
+   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
+@@ -10602,7 +10428,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -10613,7 +10439,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -10675,22 +10501,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'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # 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' ' '`
++    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,
+@@ -10700,6 +10523,30 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -10709,7 +10556,7 @@
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -10738,7 +10585,7 @@
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+-  need_version=no
++  need_version=yes
+   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
+@@ -10758,7 +10605,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -10987,8 +10834,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=$?
+@@ -11091,8 +10937,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=$?
+@@ -11157,8 +11002,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=$?
+@@ -11251,8 +11095,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=$?
+@@ -11317,8 +11160,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=$?
+@@ -11384,8 +11226,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=$?
+@@ -11451,8 +11292,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=$?
+@@ -11527,7 +11367,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11530 "configure"
++#line 11370 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11625,7 +11465,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11628 "configure"
++#line 11468 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11750,7 +11590,7 @@
+   fi
+   ;;
+ 
+-aix4*)
++aix4* | aix5*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+@@ -11760,29 +11600,29 @@
+     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
+-	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++      	allow_undefined_flag='-flat_namespace -undefined 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
++        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'
+-    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
+-    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
+@@ -11816,7 +11656,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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
+     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 \
+@@ -11994,7 +11835,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -12025,7 +11866,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -12267,7 +12108,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.
+-  test -f Makefile && make "$ltmain"
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ 
+ 
+@@ -12535,8 +12379,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
+-    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $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 -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    archive_expsym_cmds_CXX='$CC -shared -nostdlib $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'
+@@ -12562,7 +12406,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.
+-    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+@@ -12593,8 +12437,22 @@
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+     else
+-      # KDE requires run time linking.  Make it the default.
+-      aix_use_runtimelinking=yes
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++      esac
++
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+     fi
+@@ -12640,15 +12498,16 @@
+ 	shared_flag='-G'
+       else
+ 	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='-qmkshrobj ${wl}-G'
++	  shared_flag='${wl}-G'
+ 	else
+-	  shared_flag='-qmkshrobj'
++	  shared_flag='${wl}-bM:SRE'
+ 	fi
+       fi
+     fi
+ 
+-    # Let the compiler handle the export list.
+-    always_export_symbols_CXX=no
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    always_export_symbols_CXX=yes
+     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.
+@@ -12678,8 +12537,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=$?
+@@ -12708,13 +12566,12 @@
+ 
+       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-      archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+       if test "$host_cpu" = ia64; then
+ 	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+ 	allow_undefined_flag_CXX="-z nodefs"
+-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+       else
+ 	# Determine the default libpath from the value encoded in an empty executable.
+ 	cat >conftest.$ac_ext <<_ACEOF
+@@ -12741,8 +12598,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=$?
+@@ -12780,7 +12636,7 @@
+ 	whole_archive_flag_spec_CXX=' '
+ 	archive_cmds_need_lc_CXX=yes
+ 	# 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'
++	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
+     ;;
+@@ -12797,12 +12653,12 @@
+     # _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'
+-    allow_undefined_flag_CXX=no
++    allow_undefined_flag_CXX=unsupported
+     always_export_symbols_CXX=no
+     enable_shared_with_static_runtimes_CXX=yes
+ 
+     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+       # 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
+@@ -12811,7 +12667,7 @@
+ 	echo EXPORTS > $output_objdir/$soname.def;
+ 	cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+     else
+       ld_shlibs_CXX=no
+     fi
+@@ -12822,20 +12678,20 @@
+     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
+-	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
++        case ${MACOSX_DEPLOYMENT_TARGET} in
++          10.[012])
++            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
++            ;;
++          10.*)
++            allow_undefined_flag_CXX='-undefined dynamic_lookup'
++            ;;
++        esac
+       fi
+       ;;
+     esac
+@@ -12845,19 +12701,19 @@
+       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
+-      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
+-    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
+-      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
+-      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
+-    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
+@@ -12892,7 +12748,7 @@
+   freebsd-elf*)
+     archive_cmds_need_lc_CXX=no
+     ;;
+-  freebsd*)
++  freebsd* | kfreebsd*-gnu)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     ld_shlibs_CXX=yes
+@@ -12914,7 +12770,7 @@
+       ld_shlibs_CXX=no
+       ;;
+     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'
++      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.
+@@ -12923,11 +12779,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'
+       ;;
+     *)
+       if test "$GXX" = yes; then
+-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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'
++        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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'
+       else
+         # FIXME: insert proper C++ library support
+         ld_shlibs_CXX=no
+@@ -12984,7 +12840,7 @@
+ 	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	  ;;
+ 	*)
+-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	esac
+ 	# Commands to make compiler produce verbose output that lists
+@@ -13005,7 +12861,7 @@
+ 	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	      ;;
+ 	    *)
+-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    esac
+ 	  fi
+@@ -13020,7 +12876,7 @@
+     case $cc_basename in
+       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'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+@@ -13031,9 +12887,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'
+ 	  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
+@@ -13050,8 +12906,8 @@
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+-	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+@@ -13073,16 +12929,16 @@
+ 	# Intel C++
+ 	with_gnu_ld=yes
+ 	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)
+ 	# 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'
++	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  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+ 	runpath_var=LD_RUN_PATH
+ 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+@@ -13120,7 +12976,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+     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=
+@@ -13139,7 +12995,7 @@
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ 	hardcode_libdir_separator_CXX=:
+@@ -13156,7 +13012,7 @@
+ 	;;
+       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'
+ 
+ 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ 	hardcode_libdir_separator_CXX=:
+@@ -13174,7 +13030,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'
+ 
+ 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ 	  hardcode_libdir_separator_CXX=:
+@@ -13199,7 +13055,7 @@
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ 	hardcode_libdir_separator_CXX=:
+@@ -13215,10 +13071,10 @@
+ 	;;
+       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_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~
+ 	  $rm $lib.exp'
+ 
+ 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+@@ -13237,7 +13093,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'
+ 
+ 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ 	  hardcode_libdir_separator_CXX=:
+@@ -13294,9 +13150,9 @@
+       CC)
+ 	# Sun C++ 4.2, 5.x and Centerline C++
+ 	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_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'
+ 
+ 	hardcode_libdir_flag_spec_CXX='-R$libdir'
+ 	hardcode_shlibpath_var_CXX=no
+@@ -13330,7 +13186,7 @@
+ 	;;
+       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'
+@@ -13340,9 +13196,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
+-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -13351,9 +13207,9 @@
+ 	  else
+ 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	    # platform.
+-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -13468,7 +13324,7 @@
+        fi
+        ;;
+ 
+-    *.$objext|*.$libext)
++    *.$objext)
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+        if test "$p" = "conftest.$objext"; then
+@@ -13603,7 +13459,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd*)
++      freebsd* | kfreebsd*-gnu)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -13679,7 +13535,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -13790,11 +13646,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13793: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13649: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:13797: \$? = $ac_status" >&5
++   echo "$as_me:13653: \$? = $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
+@@ -13841,13 +13697,6 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    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.
+@@ -13857,11 +13706,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13860: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13709: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:13864: \$? = $ac_status" >&5
++   echo "$as_me:13713: \$? = $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
+@@ -13871,8 +13720,11 @@
+      fi
+    fi
+    chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
+    cd ..
+    rmdir conftest
+    $rm conftest*
+@@ -13924,6 +13776,9 @@
+   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'
+   ;;
++  linux*)
++    link_all_deplibs_CXX=no
++  ;;
+   *)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+@@ -14005,7 +13860,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -14015,7 +13870,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -14080,7 +13948,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+@@ -14105,7 +13973,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -14170,7 +14038,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)'
+   # 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"`
+@@ -14193,7 +14061,7 @@
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*-gnu*)
++kfreebsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -14253,7 +14121,7 @@
+   need_version=no
+   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
+@@ -14268,7 +14136,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -14279,7 +14147,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -14341,22 +14209,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'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # 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' ' '`
++    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,
+@@ -14366,6 +14231,30 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -14375,7 +14264,7 @@
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -14404,7 +14293,7 @@
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+-  need_version=no
++  need_version=yes
+   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
+@@ -14424,7 +14313,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -14653,8 +14542,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=$?
+@@ -14757,8 +14645,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=$?
+@@ -14823,8 +14710,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=$?
+@@ -14917,8 +14803,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=$?
+@@ -14983,8 +14868,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=$?
+@@ -15050,8 +14934,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=$?
+@@ -15117,8 +15000,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=$?
+@@ -15193,7 +15075,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 15196 "configure"
++#line 15078 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -15291,7 +15173,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 15294 "configure"
++#line 15176 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -15408,7 +15290,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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
+     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 \
+@@ -15538,7 +15421,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -15569,7 +15452,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -15786,7 +15669,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.
+-  test -f Makefile && make "$ltmain"
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ 
+ 
+@@ -15888,7 +15774,7 @@
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+-aix4*)
++aix4* | aix5*)
+   test "$enable_shared" = yes && enable_static=no
+   ;;
+ esac
+@@ -16114,11 +16000,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16117: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16003: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16121: \$? = $ac_status" >&5
++   echo "$as_me:16007: \$? = $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
+@@ -16165,13 +16051,6 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    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.
+@@ -16181,11 +16060,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16184: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16063: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16188: \$? = $ac_status" >&5
++   echo "$as_me:16067: \$? = $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
+@@ -16195,8 +16074,11 @@
+      fi
+    fi
+    chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
+    cd ..
+    rmdir conftest
+    $rm conftest*
+@@ -16324,7 +16206,7 @@
+ 	allow_undefined_flag_F77=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds_F77='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	ld_shlibs_F77=no
+       fi
+@@ -16334,13 +16216,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'
+-      allow_undefined_flag_F77=no
++      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'
+ 
+       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'
++        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ 	# 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
+@@ -16349,19 +16231,19 @@
+ 	  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
+       fi
+       ;;
+ 
+-    netbsd*)
++    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'
+ 	wlarc=
+       else
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+@@ -16379,8 +16261,8 @@
+ 
+ EOF
+       elif $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'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs_F77=no
+       fi
+@@ -16393,10 +16275,36 @@
+       hardcode_shlibpath_var_F77=no
+       ;;
+ 
++  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'
+-	archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs_F77=no
+       fi
+@@ -16446,9 +16354,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
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+@@ -16494,21 +16413,22 @@
+ 	  shared_flag='-G'
+ 	else
+   	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
++	    shared_flag='${wl}-bM:SRE'
+   	fi
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      always_export_symbols_F77=no
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_F77=yes
+       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.
+ 	allow_undefined_flag_F77='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
++       cat >conftest.$ac_ext <<_ACEOF
+       program main
+ 
+       end
+@@ -16522,8 +16442,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -16550,14 +16469,13 @@
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
+ 	  allow_undefined_flag_F77="-z nodefs"
+-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 cat >conftest.$ac_ext <<_ACEOF
+@@ -16574,8 +16492,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -16613,7 +16530,7 @@
+ 	  whole_archive_flag_spec_F77=' '
+ 	  archive_cmds_need_lc_F77=yes
+ 	  # 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'
++	  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
+       ;;
+@@ -16636,13 +16553,13 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       hardcode_libdir_flag_spec_F77=' '
+-      allow_undefined_flag_F77=no
++      allow_undefined_flag_F77=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+-      archive_cmds_F77='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # 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.
+@@ -16656,21 +16573,21 @@
+       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
+-	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
++      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
+ 	;;
+       esac
+     	lt_int_apple_cc_single_mod=no
+@@ -16679,18 +16596,18 @@
+     	  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
+-        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
+-      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
+-          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
+-          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
+-          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}'
+       hardcode_direct_F77=no
+       hardcode_automatic_F77=yes
+       hardcode_shlibpath_var_F77=unsupported
+@@ -16731,8 +16648,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd*)
+-      archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++    freebsd* | kfreebsd*-gnu)
++      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
+@@ -16740,7 +16657,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       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
+@@ -16758,10 +16675,10 @@
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ 	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'
+ 	  ;;
+ 	*)
+-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+@@ -16808,7 +16725,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $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_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'
+@@ -16818,7 +16735,7 @@
+       link_all_deplibs_F77=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -16841,7 +16758,7 @@
+       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'
+ 	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+ 	export_dynamic_flag_spec_F77='${wl}-E'
+       else
+@@ -16851,7 +16768,7 @@
+ 	   hardcode_libdir_flag_spec_F77='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   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'
+ 	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -16862,14 +16779,14 @@
+       hardcode_libdir_flag_spec_F77='-L$libdir'
+       hardcode_minus_L_F77=yes
+       allow_undefined_flag_F77=unsupported
+-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+       old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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
+ 	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'
+@@ -16881,7 +16798,7 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${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'
++	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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_F77='${wl}-rpath ${wl}$libdir'
+       else
+ 	allow_undefined_flag_F77=' -expect_unresolved \*'
+@@ -16906,9 +16823,9 @@
+     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'
++	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
+ 	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~
+@@ -16928,7 +16845,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.
+-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -16988,9 +16905,9 @@
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+       no_undefined_flag_F77='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	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'
+       else
+-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+       runpath_var='LD_RUN_PATH'
+       hardcode_shlibpath_var_F77=no
+@@ -17096,7 +17013,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -17106,7 +17023,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -17171,7 +17101,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+@@ -17196,7 +17126,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -17261,7 +17191,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)'
+   # 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"`
+@@ -17284,7 +17214,7 @@
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*-gnu*)
++kfreebsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -17344,7 +17274,7 @@
+   need_version=no
+   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
+@@ -17359,7 +17289,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -17370,7 +17300,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -17432,22 +17362,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'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # 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' ' '`
++    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,
+@@ -17457,6 +17384,30 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -17466,7 +17417,7 @@
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -17495,7 +17446,7 @@
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+-  need_version=no
++  need_version=yes
+   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
+@@ -17515,7 +17466,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -17694,7 +17645,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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
+     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 \
+@@ -17824,7 +17776,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -17855,7 +17807,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -18072,7 +18024,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.
+-  test -f Makefile && make "$ltmain"
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ 
+ 
+@@ -18154,11 +18109,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18157: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18112: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18161: \$? = $ac_status" >&5
++   echo "$as_me:18116: \$? = $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
+@@ -18387,11 +18342,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18390: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18345: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18394: \$? = $ac_status" >&5
++   echo "$as_me:18349: \$? = $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
+@@ -18438,13 +18393,6 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    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.
+@@ -18454,11 +18402,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18457: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18405: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18461: \$? = $ac_status" >&5
++   echo "$as_me:18409: \$? = $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
+@@ -18468,8 +18416,11 @@
+      fi
+    fi
+    chmod u+w .
+-   $rm conftest* out/*
+-   rmdir out
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
+    cd ..
+    rmdir conftest
+    $rm conftest*
+@@ -18597,7 +18548,7 @@
+ 	allow_undefined_flag_GCJ=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	archive_cmds_GCJ='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+@@ -18607,13 +18558,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'
+-      allow_undefined_flag_GCJ=no
++      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'
+ 
+       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'
++        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ 	# 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
+@@ -18622,19 +18573,19 @@
+ 	  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
+       fi
+       ;;
+ 
+-    netbsd*)
++    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'
+ 	wlarc=
+       else
+-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+@@ -18652,8 +18603,8 @@
+ 
+ EOF
+       elif $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'
+-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+@@ -18666,10 +18617,36 @@
+       hardcode_shlibpath_var_GCJ=no
+       ;;
+ 
++  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'
+-	archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+@@ -18719,9 +18696,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
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
+ 
+-	# KDE requires run time linking.  Make it the default.
+-	aix_use_runtimelinking=yes
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+@@ -18767,21 +18755,22 @@
+ 	  shared_flag='-G'
+ 	else
+   	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
++	    shared_flag='${wl}-bM:SRE'
+   	fi
+ 	fi
+       fi
+ 
+-      # Let the compiler handle the export list.
+-      always_export_symbols_GCJ=no
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_GCJ=yes
+       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.
+ 	allow_undefined_flag_GCJ='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+-	cat >conftest.$ac_ext <<_ACEOF
++       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -18805,8 +18794,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=$?
+@@ -18833,14 +18821,13 @@
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+-	hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	archive_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
+ 	  allow_undefined_flag_GCJ="-z nodefs"
+-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 cat >conftest.$ac_ext <<_ACEOF
+@@ -18867,8 +18854,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=$?
+@@ -18906,7 +18892,7 @@
+ 	  whole_archive_flag_spec_GCJ=' '
+ 	  archive_cmds_need_lc_GCJ=yes
+ 	  # 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'
++	  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
+       ;;
+@@ -18929,13 +18915,13 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       hardcode_libdir_flag_spec_GCJ=' '
+-      allow_undefined_flag_GCJ=no
++      allow_undefined_flag_GCJ=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+-      archive_cmds_GCJ='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # 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.
+@@ -18949,21 +18935,21 @@
+       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
+-	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
++      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
+ 	;;
+       esac
+     	lt_int_apple_cc_single_mod=no
+@@ -18972,18 +18958,18 @@
+     	  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
+-        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
+-      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
+-          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
+-          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
+-          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}'
+       hardcode_direct_GCJ=no
+       hardcode_automatic_GCJ=yes
+       hardcode_shlibpath_var_GCJ=unsupported
+@@ -19024,8 +19010,8 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd*)
+-      archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++    freebsd* | kfreebsd*-gnu)
++      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
+@@ -19033,7 +19019,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       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
+@@ -19051,10 +19037,10 @@
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ 	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'
+ 	  ;;
+ 	*)
+-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+@@ -19101,7 +19087,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $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_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'
+@@ -19111,7 +19097,7 @@
+       link_all_deplibs_GCJ=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -19134,7 +19120,7 @@
+       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'
+ 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+ 	export_dynamic_flag_spec_GCJ='${wl}-E'
+       else
+@@ -19144,7 +19130,7 @@
+ 	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   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'
+ 	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -19155,14 +19141,14 @@
+       hardcode_libdir_flag_spec_GCJ='-L$libdir'
+       hardcode_minus_L_GCJ=yes
+       allow_undefined_flag_GCJ=unsupported
+-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+       old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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
+ 	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'
+@@ -19174,7 +19160,7 @@
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
+-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${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'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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_GCJ='${wl}-rpath ${wl}$libdir'
+       else
+ 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
+@@ -19199,9 +19185,9 @@
+     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'
++	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
+ 	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~
+@@ -19221,7 +19207,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.
+-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -19281,9 +19267,9 @@
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+       no_undefined_flag_GCJ='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+-	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'
+       else
+-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+       runpath_var='LD_RUN_PATH'
+       hardcode_shlibpath_var_GCJ=no
+@@ -19389,7 +19375,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -19399,7 +19385,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -19464,7 +19463,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+@@ -19489,7 +19488,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -19554,7 +19553,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)'
+   # 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"`
+@@ -19577,7 +19576,7 @@
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*-gnu*)
++kfreebsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -19637,7 +19636,7 @@
+   need_version=no
+   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
+@@ -19652,7 +19651,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -19663,7 +19662,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -19725,22 +19724,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'
+-  libsuff=
+-  if test "x$LINUX_64_MODE" = x64; then
+-    # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
+-      libsuff=64
+-    fi
+-  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # 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' ' '`
++    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,
+@@ -19750,6 +19746,30 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -19759,7 +19779,7 @@
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -19788,7 +19808,7 @@
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+-  need_version=no
++  need_version=yes
+   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
+@@ -19808,7 +19828,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -20037,8 +20057,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=$?
+@@ -20141,8 +20160,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=$?
+@@ -20207,8 +20225,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=$?
+@@ -20301,8 +20318,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=$?
+@@ -20367,8 +20383,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=$?
+@@ -20434,8 +20449,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=$?
+@@ -20501,8 +20515,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=$?
+@@ -20577,7 +20590,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 20580 "configure"
++#line 20593 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -20675,7 +20688,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 20678 "configure"
++#line 20691 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -20792,7 +20805,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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
+     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 \
+@@ -20922,7 +20936,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -20953,7 +20967,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -21170,7 +21184,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.
+-  test -f Makefile && make "$ltmain"
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ 
+ 
+@@ -21233,7 +21250,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.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
+     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 \
+@@ -21363,7 +21381,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -21394,7 +21412,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -21611,7 +21629,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.
+-  test -f Makefile && make "$ltmain"
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ 
+ 
+@@ -21658,7 +21679,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ # Prevent multiple expansion
+ 
+@@ -21895,8 +21916,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=$?
+@@ -21970,9 +21990,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22006,8 +22023,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=$?
+@@ -22111,8 +22127,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=$?
+@@ -22191,9 +22206,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22226,8 +22238,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=$?
+@@ -22330,8 +22341,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=$?
+@@ -22421,8 +22431,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=$?
+@@ -22483,8 +22492,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=$?
+@@ -22552,8 +22560,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=$?
+@@ -22619,8 +22626,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=$?
+@@ -22713,8 +22719,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=$?
+@@ -22792,8 +22797,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=$?
+@@ -22877,8 +22881,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=$?
+@@ -22946,8 +22949,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=$?
+@@ -23042,8 +23044,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=$?
+@@ -23107,8 +23108,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=$?
+@@ -23203,8 +23203,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=$?
+@@ -23268,8 +23267,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=$?
+@@ -23365,8 +23363,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=$?
+@@ -23430,8 +23427,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=$?
+@@ -23528,8 +23524,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=$?
+@@ -23594,8 +23589,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=$?
+@@ -23663,8 +23657,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=$?
+@@ -23815,8 +23808,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=$?
+@@ -23971,8 +23963,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=$?
+@@ -24037,8 +24028,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=$?
+@@ -24185,8 +24175,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=$?
+@@ -24341,8 +24330,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=$?
+@@ -24398,9 +24386,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24434,8 +24419,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=$?
+@@ -24539,8 +24523,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=$?
+@@ -24640,8 +24623,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=$?
+@@ -24715,8 +24697,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=$?
+@@ -24779,8 +24760,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=$?
+@@ -24842,8 +24822,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=$?
+@@ -24883,8 +24862,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=$?
+@@ -24940,8 +24918,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=$?
+@@ -24981,8 +24958,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=$?
+@@ -25046,8 +25022,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=$?
+@@ -25078,10 +25053,8 @@
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -25192,8 +25165,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=$?
+@@ -25255,8 +25227,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=$?
+@@ -25296,8 +25267,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=$?
+@@ -25353,8 +25323,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=$?
+@@ -25394,8 +25363,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=$?
+@@ -25459,8 +25427,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=$?
+@@ -25491,10 +25458,8 @@
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -25605,8 +25570,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=$?
+@@ -25668,8 +25632,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=$?
+@@ -25709,8 +25672,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=$?
+@@ -25766,8 +25728,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=$?
+@@ -25807,8 +25768,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=$?
+@@ -25872,8 +25832,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=$?
+@@ -25904,10 +25863,8 @@
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -26018,8 +25975,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=$?
+@@ -26081,8 +26037,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=$?
+@@ -26122,8 +26077,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=$?
+@@ -26179,8 +26133,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=$?
+@@ -26220,8 +26173,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=$?
+@@ -26285,8 +26237,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=$?
+@@ -26317,10 +26268,8 @@
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -26439,8 +26388,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=$?
+@@ -26511,8 +26459,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=$?
+@@ -26582,8 +26529,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=$?
+@@ -26645,8 +26591,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=$?
+@@ -26686,8 +26631,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=$?
+@@ -26743,8 +26687,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=$?
+@@ -26784,8 +26727,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=$?
+@@ -26849,8 +26791,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=$?
+@@ -26881,10 +26822,8 @@
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -26996,8 +26935,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=$?
+@@ -27059,8 +26997,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=$?
+@@ -27100,8 +27037,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=$?
+@@ -27157,8 +27093,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=$?
+@@ -27198,8 +27133,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=$?
+@@ -27263,8 +27197,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=$?
+@@ -27295,10 +27228,8 @@
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -27409,8 +27340,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=$?
+@@ -27480,8 +27410,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=$?
+@@ -27661,8 +27590,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=$?
+@@ -27771,8 +27699,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=$?
+@@ -27996,8 +27923,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=$?
+@@ -28220,8 +28146,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=$?
+@@ -28297,8 +28222,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=$?
+@@ -28521,8 +28445,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=$?
+@@ -28597,8 +28520,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=$?
+@@ -28658,8 +28580,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=$?
+@@ -28742,8 +28663,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=$?
+@@ -28836,8 +28756,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=$?
+@@ -29011,8 +28930,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=$?
+@@ -29110,8 +29028,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=$?
+@@ -29204,8 +29121,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=$?
+@@ -29288,8 +29204,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=$?
+@@ -29342,7 +29257,7 @@
+ do
+   for j in jpeglib.h;
+   do
+-    echo "configure: 29345: $i/$j" >&5
++    echo "configure: 29260: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       jpeg_incdir=$i
+@@ -29650,7 +29565,7 @@
+ do
+   for j in $kde_qt_header;
+   do
+-    echo "configure: 29653: $i/$j" >&5
++    echo "configure: 29568: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       qt_incdir=$i
+@@ -30327,8 +30242,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=$?
+@@ -30487,7 +30401,7 @@
+ do
+   for j in $kde_check_header;
+   do
+-    echo "configure: 30490: $i/$j" >&5
++    echo "configure: 30404: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_incdir=$i
+@@ -30517,7 +30431,7 @@
+ do
+   for j in $kde_check_lib;
+   do
+-    echo "configure: 30520: $i/$j" >&5
++    echo "configure: 30434: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_libdir=$i
+@@ -30535,7 +30449,7 @@
+ do
+   for j in "kde3/plugins/designer/kdewidgets.la";
+   do
+-    echo "configure: 30538: $i/$j" >&5
++    echo "configure: 30452: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_widgetdir=$i
+@@ -32037,7 +31951,7 @@
+ do
+   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
+   do
+-    echo "configure: 32040: $i/$j" >&5
++    echo "configure: 31954: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       KDE_XSL_STYLESHEET=$i
+@@ -32234,8 +32148,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=$?
+@@ -32322,8 +32235,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=$?
+@@ -32410,8 +32322,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=$?
+@@ -32498,8 +32409,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=$?
+@@ -32618,8 +32528,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=$?
+@@ -32676,8 +32585,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=$?
+@@ -32816,8 +32724,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=$?
+@@ -33057,8 +32964,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=$?
+@@ -33126,8 +33032,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=$?
+@@ -33222,8 +33127,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=$?
+@@ -33466,8 +33370,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=$?
+@@ -33539,8 +33442,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=$?
+@@ -33594,8 +33496,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=$?
+@@ -33666,8 +33567,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=$?
+@@ -33721,8 +33621,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=$?
+@@ -33789,8 +33688,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=$?
+@@ -33996,8 +33894,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=$?
+@@ -34142,8 +34039,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=$?
+@@ -34316,8 +34212,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=$?
+@@ -34376,8 +34271,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=$?
+@@ -34472,8 +34366,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=$?
+@@ -34539,8 +34432,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=$?
+@@ -34605,8 +34497,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=$?
+@@ -34669,8 +34560,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=$?
+@@ -34731,8 +34621,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=$?
+@@ -34802,8 +34691,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=$?
+@@ -34869,8 +34757,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=$?
+@@ -34936,8 +34823,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=$?
+@@ -35022,8 +34908,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=$?
+@@ -35128,8 +35013,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=$?
+@@ -35194,8 +35078,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=$?
+@@ -35270,8 +35153,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=$?
+@@ -35350,8 +35232,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=$?
+@@ -35540,8 +35421,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=$?
+@@ -35603,8 +35483,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=$?
+@@ -35644,8 +35523,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=$?
+@@ -35701,8 +35579,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=$?
+@@ -35742,8 +35619,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=$?
+@@ -35807,8 +35683,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=$?
+@@ -35839,10 +35714,8 @@
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -35954,8 +35827,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=$?
+@@ -36017,8 +35889,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=$?
+@@ -36058,8 +35929,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=$?
+@@ -36115,8 +35985,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=$?
+@@ -36156,8 +36025,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=$?
+@@ -36221,8 +36089,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=$?
+@@ -36253,10 +36120,8 @@
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -36368,8 +36233,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=$?
+@@ -36431,8 +36295,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=$?
+@@ -36472,8 +36335,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=$?
+@@ -36529,8 +36391,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=$?
+@@ -36570,8 +36431,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=$?
+@@ -36635,8 +36495,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=$?
+@@ -36667,10 +36526,8 @@
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -36782,8 +36639,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=$?
+@@ -36845,8 +36701,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=$?
+@@ -36886,8 +36741,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=$?
+@@ -36943,8 +36797,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=$?
+@@ -36984,8 +36837,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=$?
+@@ -37049,8 +36901,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=$?
+@@ -37081,10 +36932,8 @@
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -37199,8 +37048,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=$?
+@@ -37242,8 +37090,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=$?
+@@ -37300,8 +37147,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=$?
+@@ -37482,8 +37328,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=$?
+@@ -37537,9 +37382,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37573,8 +37415,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=$?
+@@ -37678,8 +37519,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=$?
+@@ -37758,9 +37598,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37791,8 +37628,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=$?
+@@ -37893,8 +37729,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=$?
+@@ -37973,9 +37808,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38006,8 +37838,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=$?
+@@ -38108,8 +37939,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=$?
+@@ -38188,9 +38018,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38226,8 +38053,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=$?
+@@ -38334,8 +38160,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=$?
+@@ -38414,9 +38239,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38451,8 +38273,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=$?
+@@ -38557,8 +38378,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=$?
+@@ -38637,9 +38457,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38672,8 +38489,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=$?
+@@ -38776,8 +38592,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=$?
+@@ -38856,9 +38671,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38891,8 +38703,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=$?
+@@ -38995,8 +38806,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=$?
+@@ -39074,9 +38884,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39109,8 +38916,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=$?
+@@ -39213,8 +39019,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=$?
+@@ -39308,8 +39113,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=$?
+@@ -39496,8 +39300,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=$?
+@@ -39567,8 +39370,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=$?
+@@ -39721,8 +39523,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=$?
+@@ -40256,8 +40057,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=$?
+@@ -40549,8 +40349,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=$?
+@@ -40695,8 +40494,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=$?
+@@ -40782,8 +40580,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=$?
+@@ -40845,8 +40642,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=$?
+@@ -40917,8 +40713,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=$?
+@@ -41008,8 +40803,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=$?
+@@ -41083,8 +40877,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=$?
+@@ -41194,8 +40987,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=$?
+@@ -41364,8 +41156,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=$?
+@@ -41427,7 +41218,7 @@
+ do
+   for j in qsql.html;
+   do
+-    echo "configure: 41430: $i/$j" >&5
++    echo "configure: 41221: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       QTDOCDIR=$i
+@@ -41637,8 +41428,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=$?
+@@ -41731,8 +41521,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=$?
+@@ -41904,7 +41693,7 @@
+ do
+   for j in openssl/ssl.h;
+   do
+-    echo "configure: 41907: $i/$j" >&5
++    echo "configure: 41696: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       ssl_incdir=$i
+@@ -41959,8 +41748,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=$?
+@@ -42208,8 +41996,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=$?
+@@ -42263,8 +42050,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=$?
+@@ -42366,8 +42152,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=$?
+@@ -42432,8 +42217,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=$?
+@@ -42691,8 +42475,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=$?
+@@ -42757,8 +42540,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=$?
+@@ -42908,8 +42690,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=$?
+@@ -43062,8 +42843,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=$?
+@@ -43165,8 +42945,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=$?
+@@ -43284,8 +43063,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=$?
+@@ -43410,8 +43188,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=$?
+@@ -43798,8 +43575,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=$?
+@@ -43969,8 +43745,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=$?
+@@ -44022,13 +43797,13 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for FontEncDirectory in -lfontenc" >&5
+-echo $ECHO_N "checking for FontEncDirectory in -lfontenc... $ECHO_C" >&6
+-if test "${ac_cv_lib_fontenc_FontEncDirectory+set}" = set; then
++     echo "$as_me:$LINENO: checking for FontEncDirectory in -lfontenc_pic" >&5
++echo $ECHO_N "checking for FontEncDirectory in -lfontenc_pic... $ECHO_C" >&6
++if test "${ac_cv_lib_fontenc_pic_FontEncDirectory+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfontenc  $LIBS"
++LIBS="-lfontenc_pic  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44060,8 +43835,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=$?
+@@ -44073,20 +43847,20 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_fontenc_FontEncDirectory=yes
++  ac_cv_lib_fontenc_pic_FontEncDirectory=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_fontenc_FontEncDirectory=no
++ac_cv_lib_fontenc_pic_FontEncDirectory=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_fontenc_FontEncDirectory" >&5
+-echo "${ECHO_T}$ac_cv_lib_fontenc_FontEncDirectory" >&6
+-if test $ac_cv_lib_fontenc_FontEncDirectory = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_fontenc_pic_FontEncDirectory" >&5
++echo "${ECHO_T}$ac_cv_lib_fontenc_pic_FontEncDirectory" >&6
++if test $ac_cv_lib_fontenc_pic_FontEncDirectory = yes; then
+   ac_font_enc_lib=1
+ else
+   ac_font_enc_lib=0
+@@ -44096,7 +43870,7 @@
+      LIBS="$kde_save_LIBS"
+ 
+             if test "$ac_font_enc_lib" = "1"; then
+-                LIB_FONT_ENC="-lfontenc"
++                LIB_FONT_ENC="-lfontenc_pic"
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_FONT_ENC 1
+@@ -44147,8 +43921,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=$?
+@@ -44378,8 +44151,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=$?
+@@ -44445,8 +44217,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=$?
+@@ -44492,8 +44263,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=$?
+@@ -44573,8 +44343,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=$?
+@@ -44664,8 +44433,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=$?
+@@ -44768,8 +44536,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=$?
+@@ -44966,8 +44733,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=$?
+@@ -45168,8 +44934,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=$?
+@@ -45247,8 +45012,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=$?
+@@ -45311,8 +45075,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=$?
+@@ -45396,8 +45159,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=$?
+@@ -45439,13 +45201,13 @@
+ 
+ fi
+ 
+-        echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
+-echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6
+-if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
++        echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss_pic" >&5
++echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss_pic... $ECHO_C" >&6
++if test "${ac_cv_lib_Xss_pic_XScreenSaverQueryInfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lXss  $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
++LIBS="-lXss_pic  $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -45477,8 +45239,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=$?
+@@ -45490,27 +45251,27 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_Xss_XScreenSaverQueryInfo=yes
++  ac_cv_lib_Xss_pic_XScreenSaverQueryInfo=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xss_XScreenSaverQueryInfo=no
++ac_cv_lib_Xss_pic_XScreenSaverQueryInfo=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6
+-if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_pic_XScreenSaverQueryInfo" >&5
++echo "${ECHO_T}$ac_cv_lib_Xss_pic_XScreenSaverQueryInfo" >&6
++if test $ac_cv_lib_Xss_pic_XScreenSaverQueryInfo = yes; then
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_XSCREENSAVER 1
+ _ACEOF
+ 
+-            LIB_XSS="-lXss"
++            LIB_XSS="-lXss_pic"
+ 
+ fi
+ 
+@@ -45579,8 +45340,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=$?
+@@ -45605,13 +45365,13 @@
+ echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86misc_h" >&6
+ if test $ac_cv_header_X11_extensions_xf86misc_h = yes; then
+ 
+-    echo "$as_me:$LINENO: checking for XF86MiscQueryVersion in -lXxf86misc" >&5
+-echo $ECHO_N "checking for XF86MiscQueryVersion in -lXxf86misc... $ECHO_C" >&6
+-if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryVersion+set}" = set; then
++    echo "$as_me:$LINENO: checking for XF86MiscQueryVersion in -lXxf86misc_pic" >&5
++echo $ECHO_N "checking for XF86MiscQueryVersion in -lXxf86misc_pic... $ECHO_C" >&6
++if test "${ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lXxf86misc  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
++LIBS="-lXxf86misc_pic  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -45643,8 +45403,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=$?
+@@ -45656,27 +45415,27 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=yes
++  ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=no
++ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&6
+-if test $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion" >&5
++echo "${ECHO_T}$ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion" >&6
++if test $ac_cv_lib_Xxf86misc_pic_XF86MiscQueryVersion = yes; then
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_XF86MISC 1
+ _ACEOF
+ 
+-	LIB_XF86MISC="-lXxf86misc"
++	LIB_XF86MISC="-lXxf86misc_pic"
+ 
+ fi
+ 
+@@ -45695,13 +45454,13 @@
+ 
+ 
+ if test -n "$LIB_XF86MISC"; then
+-    echo "$as_me:$LINENO: checking for XF86MiscSetGrabKeysState in -lXxf86misc" >&5
+-echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc... $ECHO_C" >&6
+-if test "${ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState+set}" = set; then
++    echo "$as_me:$LINENO: checking for XF86MiscSetGrabKeysState in -lXxf86misc_pic" >&5
++echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc_pic... $ECHO_C" >&6
++if test "${ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lXxf86misc  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
++LIBS="-lXxf86misc_pic  $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -45733,8 +45492,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=$?
+@@ -45746,20 +45504,20 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=yes
++  ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=no
++ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&6
+-if test $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState" >&5
++echo "${ECHO_T}$ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState" >&6
++if test $ac_cv_lib_Xxf86misc_pic_XF86MiscSetGrabKeysState = yes; then
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -45962,8 +45720,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=$?
+@@ -46118,7 +45875,7 @@
+ 
+ EOF
+     if $XMKMF >&5 2>&1 && test -f Makefile; then
+-	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null`
++	kde_cv_defines_imake=`${MAKE-make} -s acimake 2> /dev/null`
+ 	kde_cv_defines_imake_version=$imkv
+     else
+         echo "$as_me:$LINENO: result: failed" >&5
+@@ -46234,8 +45991,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=$?
+@@ -46334,8 +46090,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=$?
+@@ -46433,8 +46188,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=$?
+@@ -46502,8 +46256,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=$?
+@@ -46547,8 +46300,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=$?
+@@ -46614,8 +46366,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=$?
+@@ -46659,8 +46410,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=$?
+@@ -46729,8 +46479,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=$?
+@@ -46777,8 +46526,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=$?
+@@ -46888,8 +46636,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=$?
+@@ -46995,8 +46742,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=$?
+@@ -47181,8 +46927,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=$?
+@@ -47293,8 +47038,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=$?
+@@ -47328,13 +47072,13 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -lXau" >&5
+-echo $ECHO_N "checking for main in -lXau... $ECHO_C" >&6
+-if test "${ac_cv_lib_Xau_main+set}" = set; then
++echo "$as_me:$LINENO: checking for main in -lXau_pic" >&5
++echo $ECHO_N "checking for main in -lXau_pic... $ECHO_C" >&6
++if test "${ac_cv_lib_Xau_pic_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lXau $X_LDFLAGS -lX11 $LIBSOCKET $LIBS"
++LIBS="-lXau_pic $X_LDFLAGS -lX11 $LIBSOCKET $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -47360,8 +47104,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=$?
+@@ -47373,20 +47116,20 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_Xau_main=yes
++  ac_cv_lib_Xau_pic_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xau_main=no
++ac_cv_lib_Xau_pic_main=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xau_main" >&6
+-if test $ac_cv_lib_Xau_main = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_pic_main" >&5
++echo "${ECHO_T}$ac_cv_lib_Xau_pic_main" >&6
++if test $ac_cv_lib_Xau_pic_main = yes; then
+   :
+ else
+ 
+@@ -47406,13 +47149,13 @@
+   with_xdmcp=yes
+ fi;
+ if test "x$with_xdmcp" = xyes; then
+-  echo "$as_me:$LINENO: checking for main in -lXdmcp" >&5
+-echo $ECHO_N "checking for main in -lXdmcp... $ECHO_C" >&6
+-if test "${ac_cv_lib_Xdmcp_main+set}" = set; then
++  echo "$as_me:$LINENO: checking for main in -lXdmcp_pic" >&5
++echo $ECHO_N "checking for main in -lXdmcp_pic... $ECHO_C" >&6
++if test "${ac_cv_lib_Xdmcp_pic_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lXdmcp $X_LDFLAGS -lX11 $LIBSOCKET $LIBS"
++LIBS="-lXdmcp_pic $X_LDFLAGS -lX11 $LIBSOCKET $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -47438,8 +47181,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=$?
+@@ -47451,21 +47193,21 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_Xdmcp_main=yes
++  ac_cv_lib_Xdmcp_pic_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xdmcp_main=no
++ac_cv_lib_Xdmcp_pic_main=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xdmcp_main" >&6
+-if test $ac_cv_lib_Xdmcp_main = yes; then
+-  LIBXDMCP="-lXdmcp"
++echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_pic_main" >&5
++echo "${ECHO_T}$ac_cv_lib_Xdmcp_pic_main" >&6
++if test $ac_cv_lib_Xdmcp_pic_main = yes; then
++  LIBXDMCP="-lXdmcp_pic"
+ fi
+ 
+   if test -n "$LIBXDMCP"; then
+@@ -47495,8 +47237,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=$?
+@@ -47605,8 +47346,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=$?
+@@ -47715,8 +47455,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=$?
+@@ -47819,8 +47558,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=$?
+@@ -47888,8 +47626,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=$?
+@@ -47979,8 +47716,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=$?
+@@ -48156,8 +47892,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=$?
+@@ -48463,8 +48198,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=$?
+@@ -48555,7 +48289,7 @@
+ do
+   for j in openssl/ssl.h;
+   do
+-    echo "configure: 48558: $i/$j" >&5
++    echo "configure: 48292: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       ssl_incdir=$i
+@@ -48610,8 +48344,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=$?
+@@ -48848,8 +48581,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=$?
+@@ -49021,8 +48753,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=$?
+@@ -49193,8 +48924,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=$?
+@@ -49286,8 +49016,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=$?
+@@ -49376,8 +49105,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=$?
+@@ -49466,8 +49194,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=$?
+@@ -49561,8 +49288,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=$?
+@@ -49667,8 +49393,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=$?
+@@ -49857,8 +49582,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=$?
+@@ -49916,7 +49640,7 @@
+ do
+   for j in ldap.h;
+   do
+-    echo "configure: 49919: $i/$j" >&5
++    echo "configure: 49643: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       ldap_incdir=$i
+@@ -49938,7 +49662,7 @@
+ do
+   for j in libldap.$ext;
+   do
+-    echo "configure: 49941: $i/$j" >&5
++    echo "configure: 49665: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       ldap_libdir=$i
+@@ -50035,8 +49759,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=$?
+@@ -50133,8 +49856,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=$?
+@@ -50292,7 +50014,7 @@
+ do
+   for j in libhal.h libhal-storage.h;
+   do
+-    echo "configure: 50295: $i/$j" >&5
++    echo "configure: 50017: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       hal_incdir=$i
+@@ -50314,7 +50036,7 @@
+ do
+   for j in libhal.so libhal-storage.so;
+   do
+-    echo "configure: 50317: $i/$j" >&5
++    echo "configure: 50039: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       hal_libdir=$i
+@@ -50359,7 +50081,7 @@
+ do
+   for j in dbus/dbus.h;
+   do
+-    echo "configure: 50362: $i/$j" >&5
++    echo "configure: 50084: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbus_incdir=$i
+@@ -50376,7 +50098,7 @@
+ do
+   for j in dbus/dbus-arch-deps.h;
+   do
+-    echo "configure: 50379: $i/$j" >&5
++    echo "configure: 50101: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbus_incdir_arch_deps=$i
+@@ -50398,7 +50120,7 @@
+ do
+   for j in libdbus-1.so;
+   do
+-    echo "configure: 50401: $i/$j" >&5
++    echo "configure: 50123: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbus_libdir=$i
+@@ -50441,7 +50163,7 @@
+ do
+   for j in dbus/connection.h;
+   do
+-    echo "configure: 50444: $i/$j" >&5
++    echo "configure: 50166: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbusqt_incdir=$i
+@@ -50468,7 +50190,7 @@
+ do
+   for j in libdbus-qt-1.so;
+   do
+-    echo "configure: 50471: $i/$j" >&5
++    echo "configure: 50193: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       dbusqt_libdir=$i
+@@ -50582,8 +50304,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=$?
+@@ -50612,8 +50333,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=$?
+@@ -50683,8 +50403,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=$?
+@@ -50736,8 +50455,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=$?
+@@ -50808,8 +50526,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=$?
+@@ -50861,8 +50578,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=$?
+@@ -50952,8 +50668,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=$?
+@@ -51122,8 +50837,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=$?
+@@ -51240,8 +50954,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=$?
+@@ -51316,8 +51029,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=$?
+@@ -51577,8 +51289,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=$?
+@@ -51700,8 +51411,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=$?
+@@ -51787,8 +51497,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=$?
+@@ -51856,8 +51565,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=$?
+@@ -51912,8 +51620,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=$?
+@@ -52537,8 +52244,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=$?
+@@ -52617,8 +52323,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=$?
+@@ -52681,8 +52386,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=$?
+@@ -52879,8 +52583,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=$?
+@@ -52982,8 +52685,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=$?
+@@ -53152,8 +52854,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=$?
+@@ -53239,8 +52940,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=$?
+@@ -53326,8 +53026,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=$?
+@@ -53425,8 +53124,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=$?
+@@ -53582,8 +53280,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=$?
+@@ -53663,8 +53360,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=$?
+@@ -55229,6 +54925,13 @@
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ 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
+@@ -56806,6 +56509,9 @@
+ s,@AMTAR@,$AMTAR,;t t
+ s,@am__tar@,$am__tar,;t t
+ s,@am__untar@,$am__untar,;t t
++s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
++s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
++s,@MAINT@,$MAINT,;t t
+ s,@KDECONFIG@,$KDECONFIG,;t t
+ s,@kde_libs_prefix@,$kde_libs_prefix,;t t
+ s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
+@@ -57374,11 +57080,6 @@
+   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+   esac
+ 
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+   # 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.  */
+@@ -57417,6 +57118,12 @@
+ 	 fi;;
+       esac
+     done` || { (exit 1); exit 1; }
++
++  if test x"$ac_file" != x-; then
++    { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    rm -f "$ac_file"
++  fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+   sed "$ac_vpsub
+diff -Nrua kdebase-3.4.0.orig/configure.in kdebase-3.4.0/configure.in
+--- kdebase-3.4.0.orig/configure.in	2005-03-04 08:11:05.000000000 -0500
++++ kdebase-3.4.0/configure.in	2005-03-04 19:36:07.000000000 -0500
+@@ -42,6 +42,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(kdebase, "3.4.0") dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header
+@@ -563,9 +565,9 @@
+             ld_shared_flag=
+             KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
+             LDFLAGS="$LDFLAGS $ld_shared_flag $all_libraries -lz"
+-            KDE_CHECK_LIB(fontenc,FontEncDirectory,ac_font_enc_lib=1,ac_font_enc_lib=0)
++            KDE_CHECK_LIB(fontenc_pic,FontEncDirectory,ac_font_enc_lib=1,ac_font_enc_lib=0)
+             if test "$ac_font_enc_lib" = "1"; then
+-                LIB_FONT_ENC="-lfontenc"
++                LIB_FONT_ENC="-lfontenc_pic"
+                 AC_DEFINE(HAVE_FONT_ENC, 1, [Defines if you have FontEnc])
+             fi
+             LDFLAGS="$ac_LDFLAGS_save"
+@@ -696,10 +698,10 @@
+         xss_save_cxxflags="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX"
+         KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
+-        AC_CHECK_LIB(Xss,XScreenSaverQueryInfo,
++        AC_CHECK_LIB(Xss_pic,XScreenSaverQueryInfo,
+             [
+             AC_DEFINE(HAVE_XSCREENSAVER, 1, [Define if you have the XScreenSaver extension])
+-            LIB_XSS="-lXss"
++            LIB_XSS="-lXss_pic"
+             ],
+             [],
+             [ $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
+@@ -724,10 +726,10 @@
+ 
+ KDE_CHECK_HEADER(X11/extensions/xf86misc.h,
+     [
+-    AC_CHECK_LIB(Xxf86misc,XF86MiscQueryVersion,
++    AC_CHECK_LIB(Xxf86misc_pic,XF86MiscQueryVersion,
+ 	[
+         AC_DEFINE(HAVE_XF86MISC, 1, [Define if you have the xf86misc extension])
+-	LIB_XF86MISC="-lXxf86misc"
++	LIB_XF86MISC="-lXxf86misc_pic"
+         ],
+         [], [ $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
+     ],[],
+@@ -737,7 +739,7 @@
+ AC_SUBST(LIB_XF86MISC)
+ 
+ if test -n "$LIB_XF86MISC"; then
+-    AC_CHECK_LIB(Xxf86misc,XF86MiscSetGrabKeysState,
++    AC_CHECK_LIB(Xxf86misc_pic,XF86MiscSetGrabKeysState,
+ 	[
+         AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE, 1, [Define if you have XF86MiscSetGrabKeysState()])
+         ],
+@@ -819,7 +821,7 @@
+ 
+ ]EOF
+     if $XMKMF >&5 2>&1 && test -f Makefile; then
+-	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null`
++	kde_cv_defines_imake=`${MAKE-make} -s acimake 2> /dev/null`
+ 	kde_cv_defines_imake_version=$imkv
+     else
+         AC_MSG_RESULT([failed])
+@@ -922,7 +924,7 @@
+ AC_CHECK_FUNC(vsyslog, [
+   AC_DEFINE(USE_SYSLOG, 1, [Define if kdm should be built with syslog support])])
+ 
+-AC_CHECK_LIB(Xau, main, [:], 
++AC_CHECK_LIB(Xau_pic, main, [:], 
+ 	[
+ 	  AC_MSG_WARN([Cannot build KDM! Make sure that libXau.a is installed!])
+ 	  DO_NOT_COMPILE="$DO_NOT_COMPILE kdm"
+@@ -933,7 +935,7 @@
+         AC_HELP_STRING([--without-xdmcp],[build kdm without xdmcp support [default=with xdmcp]]), ,
+ 	[with_xdmcp=yes])
+ if test "x$with_xdmcp" = xyes; then
+-  AC_CHECK_LIB(Xdmcp, main, [LIBXDMCP="-lXdmcp"], , $X_LDFLAGS -lX11 $LIBSOCKET)
++  AC_CHECK_LIB(Xdmcp_pic, main, [LIBXDMCP="-lXdmcp_pic"], , $X_LDFLAGS -lX11 $LIBSOCKET)
+   if test -n "$LIBXDMCP"; then
+     cppflags_safe=$CPPFLAGS
+     CPPFLAGS="$CPPFLAGS $X_INCLUDES"
+diff -Nrua kdebase-3.4.0.orig/doc/Makefile.in kdebase-3.4.0/doc/Makefile.in
+--- kdebase-3.4.0.orig/doc/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/Makefile.in	2005-03-04 19:44:14.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -537,13 +540,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. faq kate glossary kappfinder kcontrol kdebugdialog kdcop kdeprint kdesu kdm kfind khelpcenter kicker kinfocenter kioslave klipper kmenuedit konqueror konsole kpager ksplashml ksysguard kwrite kxkb quickstart userguide visualdict knetattach
++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
+ #>- all: all-recursive
+ #>+ 1
+ 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*) \
+@@ -581,9 +584,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:
+@@ -603,7 +606,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -615,7 +624,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -623,7 +632,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -644,7 +659,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/doc/faq/Makefile.in kdebase-3.4.0/doc/faq/Makefile.in
+--- kdebase-3.4.0.orig/doc/faq/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/faq/Makefile.in	2005-03-04 19:44:14.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -712,7 +715,7 @@
+ 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 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO about.docbook configkde.docbook contrib.docbook desktop.docbook filemng.docbook getkde.docbook index.docbook install.docbook intro.docbook kdeapps.docbook misc.docbook moreinfo.docbook nonkdeapps.docbook notrelated.docbook panel.docbook tips.docbook winmng.docbook questions.docbook sound.docbook webbrowse.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 
+ 	@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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
+-	@for base in TODO about.docbook configkde.docbook contrib.docbook desktop.docbook filemng.docbook getkde.docbook index.docbook install.docbook intro.docbook kdeapps.docbook misc.docbook moreinfo.docbook nonkdeapps.docbook notrelated.docbook panel.docbook tips.docbook winmng.docbook questions.docbook sound.docbook webbrowse.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 \
+ 	  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 TODO about.docbook configkde.docbook contrib.docbook desktop.docbook filemng.docbook getkde.docbook index.docbook install.docbook intro.docbook kdeapps.docbook misc.docbook moreinfo.docbook nonkdeapps.docbook notrelated.docbook panel.docbook tips.docbook winmng.docbook questions.docbook sound.docbook webbrowse.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 \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in TODO about.docbook configkde.docbook contrib.docbook desktop.docbook filemng.docbook getkde.docbook index.docbook install.docbook intro.docbook kdeapps.docbook misc.docbook moreinfo.docbook nonkdeapps.docbook notrelated.docbook panel.docbook tips.docbook winmng.docbook questions.docbook sound.docbook webbrowse.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 \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/glossary/Makefile.in kdebase-3.4.0/doc/glossary/Makefile.in
+--- kdebase-3.4.0.orig/doc/glossary/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/glossary/Makefile.in	2005-03-04 19:44:14.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kappfinder/Makefile.in kdebase-3.4.0/doc/kappfinder/Makefile.in
+--- kdebase-3.4.0.orig/doc/kappfinder/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kappfinder/Makefile.in	2005-03-04 19:44:14.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -525,7 +528,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*) \
+@@ -563,9 +566,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kate/Makefile.in kdebase-3.4.0/doc/kate/Makefile.in
+--- kdebase-3.4.0.orig/doc/kate/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kate/Makefile.in	2005-03-04 19:44:14.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -709,10 +712,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-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 kate.png Makefile.am mimetypechooser.png index.cache.bz2 
++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 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO advanced.docbook configdialog01.png configdialog02.png configuring.docbook fundamentals.docbook highlighted.png highlighting.docbook index.docbook kate.png mdi.docbook menus.docbook mimetypechooser.png part.docbook plugins.docbook regular-expressions.docbook unhighlighted.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 
+ 	@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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
+-	@for base in TODO advanced.docbook configdialog01.png configdialog02.png configuring.docbook fundamentals.docbook highlighted.png highlighting.docbook index.docbook kate.png mdi.docbook menus.docbook mimetypechooser.png part.docbook plugins.docbook regular-expressions.docbook unhighlighted.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 \
+ 	  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 TODO advanced.docbook configdialog01.png configdialog02.png configuring.docbook fundamentals.docbook highlighted.png highlighting.docbook index.docbook kate.png mdi.docbook menus.docbook mimetypechooser.png part.docbook plugins.docbook regular-expressions.docbook unhighlighted.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 \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in TODO advanced.docbook configdialog01.png configdialog02.png configuring.docbook fundamentals.docbook highlighted.png highlighting.docbook index.docbook kate.png mdi.docbook menus.docbook mimetypechooser.png part.docbook plugins.docbook regular-expressions.docbook unhighlighted.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 \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/Makefile.in kdebase-3.4.0/doc/kcontrol/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/Makefile.in	2005-03-04 19:44:14.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -535,7 +538,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. arts bell background cache clock colors cookies crypto desktop desktopbehavior ebrowsing email energy filemanager filetypes fonts helpindex icons kcmaccess kcmcss kcmfontinst kcmkonsole kcmlaunch kcmnotify kcmsmserver kcmstyle kcmtaskbar kdm keyboard keys khtml kwindecoration language mouse netpref panel panelappearance passwords proxy screensaver smb spellchecking useragent windowmanagement
++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
+ KDE_LANG = en
+ KDE_DOCS = AUTO
+ #>- all: all-recursive
+@@ -543,7 +546,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*) \
+@@ -581,9 +584,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:
+@@ -603,7 +606,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -615,7 +624,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -623,7 +632,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -644,7 +659,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -867,7 +882,7 @@
+ KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.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
+@@ -894,20 +909,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol
+-	@for base in index.docbook screenshot.png ; do \
++	@for base in screenshot.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook screenshot.png ; do \
++	for base in screenshot.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook screenshot.png ; do \
++	for file in screenshot.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/arts/Makefile.in kdebase-3.4.0/doc/kcontrol/arts/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/arts/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/arts/Makefile.in	2005-03-04 19:44:14.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -712,7 +715,7 @@
+ KDE_DIST=midi.docbook index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook midi.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) midi.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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts
+-	@for base in index.docbook midi.docbook ; do \
++	@for base in midi.docbook index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook midi.docbook ; do \
++	for base in midi.docbook index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook midi.docbook ; do \
++	for file in midi.docbook index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/background/Makefile.in kdebase-3.4.0/doc/kcontrol/background/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/background/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/background/Makefile.in	2005-03-04 19:44:15.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/bell/Makefile.in kdebase-3.4.0/doc/kcontrol/bell/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/bell/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/bell/Makefile.in	2005-03-04 19:44:15.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/cache/Makefile.in kdebase-3.4.0/doc/kcontrol/cache/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/cache/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/cache/Makefile.in	2005-03-04 19:44:15.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/clock/Makefile.in kdebase-3.4.0/doc/kcontrol/clock/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/clock/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/clock/Makefile.in	2005-03-04 19:44:15.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/colors/Makefile.in kdebase-3.4.0/doc/kcontrol/colors/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/colors/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/colors/Makefile.in	2005-03-04 19:44:15.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/cookies/Makefile.in kdebase-3.4.0/doc/kcontrol/cookies/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/cookies/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/cookies/Makefile.in	2005-03-04 19:44:15.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/crypto/Makefile.in kdebase-3.4.0/doc/kcontrol/crypto/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/crypto/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/crypto/Makefile.in	2005-03-04 19:44:15.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/desktop/Makefile.in kdebase-3.4.0/doc/kcontrol/desktop/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/desktop/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/desktop/Makefile.in	2005-03-04 19:44:15.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/desktopbehavior/Makefile.in kdebase-3.4.0/doc/kcontrol/desktopbehavior/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/desktopbehavior/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/desktopbehavior/Makefile.in	2005-03-04 19:44:15.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/ebrowsing/Makefile.in kdebase-3.4.0/doc/kcontrol/ebrowsing/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/ebrowsing/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/ebrowsing/Makefile.in	2005-03-04 19:44:15.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/email/Makefile.in kdebase-3.4.0/doc/kcontrol/email/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/email/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/email/Makefile.in	2005-03-04 19:44:15.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/energy/Makefile.in kdebase-3.4.0/doc/kcontrol/energy/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/energy/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/energy/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/filemanager/Makefile.in kdebase-3.4.0/doc/kcontrol/filemanager/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/filemanager/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/filemanager/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -712,7 +715,7 @@
+ KDE_DIST=kfileman1.png index.docbook Makefile.in kfileman2.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kfileman1.png kfileman2.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kfileman1.png kfileman2.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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager
+-	@for base in index.docbook kfileman1.png kfileman2.png ; do \
++	@for base in kfileman1.png kfileman2.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook kfileman1.png kfileman2.png ; do \
++	for base in kfileman1.png kfileman2.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook kfileman1.png kfileman2.png ; do \
++	for file in kfileman1.png kfileman2.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/filetypes/Makefile.in kdebase-3.4.0/doc/kcontrol/filetypes/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/filetypes/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/filetypes/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/fonts/Makefile.in kdebase-3.4.0/doc/kcontrol/fonts/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/fonts/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/fonts/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/helpindex/Makefile.in kdebase-3.4.0/doc/kcontrol/helpindex/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/helpindex/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/helpindex/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/icons/Makefile.in kdebase-3.4.0/doc/kcontrol/icons/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/icons/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/icons/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmaccess/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmaccess/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/kcmaccess/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmaccess/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmcss/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmcss/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/kcmcss/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmcss/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmfontinst/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmfontinst/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/kcmfontinst/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmfontinst/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmkonsole/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmkonsole/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/kcmkonsole/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmkonsole/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmlaunch/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmlaunch/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/kcmlaunch/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmlaunch/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmnotify/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmnotify/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/kcmnotify/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmnotify/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmsmserver/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmsmserver/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/kcmsmserver/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmsmserver/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmstyle/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmstyle/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/kcmstyle/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmstyle/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kcmtaskbar/Makefile.in kdebase-3.4.0/doc/kcontrol/kcmtaskbar/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/kcmtaskbar/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kcmtaskbar/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kdm/Makefile.in kdebase-3.4.0/doc/kcontrol/kdm/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/kdm/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kdm/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/keyboard/Makefile.in kdebase-3.4.0/doc/kcontrol/keyboard/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/keyboard/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/keyboard/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/keys/Makefile.in kdebase-3.4.0/doc/kcontrol/keys/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/keys/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/keys/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/khtml/Makefile.in kdebase-3.4.0/doc/kcontrol/khtml/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/khtml/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/khtml/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -712,7 +715,7 @@
+ KDE_DIST=index.docbook nsplugin.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook nsplugin.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) nsplugin.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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml
+-	@for base in index.docbook nsplugin.docbook ; do \
++	@for base in nsplugin.docbook index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook nsplugin.docbook ; do \
++	for base in nsplugin.docbook index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook nsplugin.docbook ; do \
++	for file in nsplugin.docbook index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/kwindecoration/Makefile.in kdebase-3.4.0/doc/kcontrol/kwindecoration/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/kwindecoration/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/kwindecoration/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/language/Makefile.in kdebase-3.4.0/doc/kcontrol/language/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/language/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/language/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/mouse/Makefile.in kdebase-3.4.0/doc/kcontrol/mouse/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/mouse/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/mouse/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/netpref/Makefile.in kdebase-3.4.0/doc/kcontrol/netpref/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/netpref/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/netpref/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/panel/Makefile.in kdebase-3.4.0/doc/kcontrol/panel/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/panel/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/panel/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/panelappearance/Makefile.in kdebase-3.4.0/doc/kcontrol/panelappearance/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/panelappearance/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/panelappearance/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/passwords/Makefile.in kdebase-3.4.0/doc/kcontrol/passwords/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/passwords/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/passwords/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/proxy/Makefile.in kdebase-3.4.0/doc/kcontrol/proxy/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/proxy/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/proxy/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -712,7 +715,7 @@
+ KDE_DIST=socks.docbook index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook socks.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) socks.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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/proxy
+-	@for base in index.docbook socks.docbook ; do \
++	@for base in socks.docbook index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/proxy/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/proxy/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook socks.docbook ; do \
++	for base in socks.docbook index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/proxy/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook socks.docbook ; do \
++	for file in socks.docbook index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/screensaver/Makefile.in kdebase-3.4.0/doc/kcontrol/screensaver/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/screensaver/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/screensaver/Makefile.in	2005-03-04 19:44:16.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/smb/Makefile.in kdebase-3.4.0/doc/kcontrol/smb/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/smb/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/smb/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/spellchecking/Makefile.in kdebase-3.4.0/doc/kcontrol/spellchecking/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/spellchecking/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/spellchecking/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/useragent/Makefile.in kdebase-3.4.0/doc/kcontrol/useragent/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/useragent/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/useragent/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kcontrol/windowmanagement/Makefile.in kdebase-3.4.0/doc/kcontrol/windowmanagement/Makefile.in
+--- kdebase-3.4.0.orig/doc/kcontrol/windowmanagement/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kcontrol/windowmanagement/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kdcop/Makefile.in kdebase-3.4.0/doc/kdcop/Makefile.in
+--- kdebase-3.4.0.orig/doc/kdcop/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kdcop/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kdebugdialog/Makefile.in kdebase-3.4.0/doc/kdebugdialog/Makefile.in
+--- kdebase-3.4.0.orig/doc/kdebugdialog/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kdebugdialog/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kdeprint/Makefile.in kdebase-3.4.0/doc/kdeprint/Makefile.in
+--- kdebase-3.4.0.orig/doc/kdeprint/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kdeprint/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -709,10 +712,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png highlights.docbook cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png kprinter_called_from_run_command.png index.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsserverconfiguration_resourceadminaccessmasks.png cupsaddprinterwizard3_networkscan_results.png ps-boxes.png cupsaddprinterwizard3_networkscan.png final-word.docbook cupsserverconfiguration4_directories.png cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kdeprint-jobviewer.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfiguration7_miscellanious.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard1.png cups-config.docbook cupsserverconfiguration9_networkclients.png cupsserverconfig_browse_relay_add_button.png add-printer-wiz.docbook cupsserverconfiguration_resourceadminauthorization.png rlpr.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration8_networkgeneral.png lpd.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png kprinter-kivio.png cupsserverconfiguration6_encryption.png theory.docbook kcron_to_be_printed.png extensions.docbook Makefile.am cupsserverconfiguration2_general.png index.cache.bz2 
++KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png highlights.docbook cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png index.docbook kprinter_called_from_run_command.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration_resourceadminaccessmasks.png ps-boxes.png cupsaddprinterwizard3_networkscan.png final-word.docbook cupsserverconfiguration4_directories.png cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kcontrolcenter-printmanager-jobcontrol-2.png kdeprint-jobviewer.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfiguration7_miscellanious.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration5_HTTP.png cups-config.docbook cupsaddprinterwizard1.png cupsserverconfiguration9_networkclients.png cupsserverconfig_browse_relay_add_button.png add-printer-wiz.docbook cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png rlpr.docbook cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration1_welcome.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png lpd.docbook cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration6_encryption.png kprinter-kivio.png theory.docbook kcron_to_be_printed.png Makefile.am extensions.docbook cupsserverconfiguration2_general.png index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) add-printer-wiz.docbook cr32-action-wizard.png cups-config.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard1.png cupsaddprinterwizard2_backendselection.png cupsaddprinterwizard3_networkscan.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsoptions.docbook cupsserverconfig_browse_relay_add_button.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration11_browsingconnections.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration1_welcome.png cupsserverconfiguration2_general.png cupsserverconfiguration3_logging.png cupsserverconfiguration4_directories.png cupsserverconfiguration5_HTTP.png cupsserverconfiguration6_encryption.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration_resourceadminaccessmasks.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration_securityoverview.png extensions.docbook external-command.docbook final-word.docbook getting-started.docbook highlights.docbook index.docbook kcontrol-icon.png kcontrolcenter-printmanager-jobcontrol-2.png kcron_to_be_printed.png kdeprint-jobviewer.png kprinter-as-netscape-printcommand.png kprinter-kivio.png kprinter.png kprinter_called_from_run_command.png kprinter_with_kcron_developer_special.png lpd.docbook lpr-bsd.docbook lprng.docbook ps-boxes.png rlpr.docbook steinbruch_scaled.png tech-overview.docbook theory.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
+-	@for base in add-printer-wiz.docbook cr32-action-wizard.png cups-config.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard1.png cupsaddprinterwizard2_backendselection.png cupsaddprinterwizard3_networkscan.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsoptions.docbook cupsserverconfig_browse_relay_add_button.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration11_browsingconnections.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration1_welcome.png cupsserverconfiguration2_general.png cupsserverconfiguration3_logging.png cupsserverconfiguration4_directories.png cupsserverconfiguration5_HTTP.png cupsserverconfiguration6_encryption.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration_resourceadminaccessmasks.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration_securityoverview.png extensions.docbook external-command.docbook final-word.docbook getting-started.docbook highlights.docbook index.docbook kcontrol-icon.png kcontrolcenter-printmanager-jobcontrol-2.png kcron_to_be_printed.png kdeprint-jobviewer.png kprinter-as-netscape-printcommand.png kprinter-kivio.png kprinter.png kprinter_called_from_run_command.png kprinter_with_kcron_developer_special.png lpd.docbook lpr-bsd.docbook lprng.docbook ps-boxes.png rlpr.docbook steinbruch_scaled.png tech-overview.docbook theory.docbook ; do \
++	@for base in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in add-printer-wiz.docbook cr32-action-wizard.png cups-config.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard1.png cupsaddprinterwizard2_backendselection.png cupsaddprinterwizard3_networkscan.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsoptions.docbook cupsserverconfig_browse_relay_add_button.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration11_browsingconnections.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration1_welcome.png cupsserverconfiguration2_general.png cupsserverconfiguration3_logging.png cupsserverconfiguration4_directories.png cupsserverconfiguration5_HTTP.png cupsserverconfiguration6_encryption.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration_resourceadminaccessmasks.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration_securityoverview.png extensions.docbook external-command.docbook final-word.docbook getting-started.docbook highlights.docbook index.docbook kcontrol-icon.png kcontrolcenter-printmanager-jobcontrol-2.png kcron_to_be_printed.png kdeprint-jobviewer.png kprinter-as-netscape-printcommand.png kprinter-kivio.png kprinter.png kprinter_called_from_run_command.png kprinter_with_kcron_developer_special.png lpd.docbook lpr-bsd.docbook lprng.docbook ps-boxes.png rlpr.docbook steinbruch_scaled.png tech-overview.docbook theory.docbook ; do \
++	for base in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in add-printer-wiz.docbook cr32-action-wizard.png cups-config.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard1.png cupsaddprinterwizard2_backendselection.png cupsaddprinterwizard3_networkscan.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsoptions.docbook cupsserverconfig_browse_relay_add_button.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration11_browsingconnections.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration1_welcome.png cupsserverconfiguration2_general.png cupsserverconfiguration3_logging.png cupsserverconfiguration4_directories.png cupsserverconfiguration5_HTTP.png cupsserverconfiguration6_encryption.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration_resourceadminaccessmasks.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration_securityoverview.png extensions.docbook external-command.docbook final-word.docbook getting-started.docbook highlights.docbook index.docbook kcontrol-icon.png kcontrolcenter-printmanager-jobcontrol-2.png kcron_to_be_printed.png kdeprint-jobviewer.png kprinter-as-netscape-printcommand.png kprinter-kivio.png kprinter.png kprinter_called_from_run_command.png kprinter_with_kcron_developer_special.png lpd.docbook lpr-bsd.docbook lprng.docbook ps-boxes.png rlpr.docbook steinbruch_scaled.png tech-overview.docbook theory.docbook ; do \
++	for file in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kdesu/Makefile.in kdebase-3.4.0/doc/kdesu/Makefile.in
+--- kdebase-3.4.0.orig/doc/kdesu/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kdesu/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kdm/Makefile.in kdebase-3.4.0/doc/kdm/Makefile.in
+--- kdebase-3.4.0.orig/doc/kdm/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kdm/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -525,7 +528,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*) \
+@@ -563,9 +566,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:
+@@ -716,7 +719,7 @@
+ KDE_DIST=index.docbook kdmrc-ref.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kdmrc-ref.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdmrc-ref.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
+@@ -743,20 +746,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm
+-	@for base in index.docbook kdmrc-ref.docbook ; do \
++	@for base in kdmrc-ref.docbook index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook kdmrc-ref.docbook ; do \
++	for base in kdmrc-ref.docbook index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook kdmrc-ref.docbook ; do \
++	for file in kdmrc-ref.docbook index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kfind/Makefile.in kdebase-3.4.0/doc/kfind/Makefile.in
+--- kdebase-3.4.0.orig/doc/kfind/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kfind/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/khelpcenter/Makefile.in kdebase-3.4.0/doc/khelpcenter/Makefile.in
+--- kdebase-3.4.0.orig/doc/khelpcenter/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/khelpcenter/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -543,7 +546,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*) \
+@@ -581,9 +584,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:
+@@ -603,7 +606,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -615,7 +624,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -623,7 +632,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -644,7 +659,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -867,7 +882,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
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) background.png bgtable.png contact.docbook help.docbook index.docbook kdelogo2.png khelpcenter.png konq.css lines.png lines2.png pointers.png shadow1.png support.docbook welcome.docbook whatiskde.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.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
+@@ -894,20 +909,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter
+-	@for base in background.png bgtable.png contact.docbook help.docbook index.docbook kdelogo2.png khelpcenter.png konq.css lines.png lines2.png pointers.png shadow1.png support.docbook welcome.docbook whatiskde.docbook ; do \
++	@for base in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in background.png bgtable.png contact.docbook help.docbook index.docbook kdelogo2.png khelpcenter.png konq.css lines.png lines2.png pointers.png shadow1.png support.docbook welcome.docbook whatiskde.docbook ; do \
++	for base in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in background.png bgtable.png contact.docbook help.docbook index.docbook kdelogo2.png khelpcenter.png konq.css lines.png lines2.png pointers.png shadow1.png support.docbook welcome.docbook whatiskde.docbook ; do \
++	for file in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kicker/Makefile.in kdebase-3.4.0/doc/kicker/Makefile.in
+--- kdebase-3.4.0.orig/doc/kicker/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kicker/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -709,10 +712,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 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) bookmarks_icon.png desktop_icon.png index.docbook k_menu_icon.png printsys_icon.png quickbrowser_icon.png recent_docs_icon.png screenshot_left.png screenshot_right.png taskbar_group.png terminals_icon.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 
+ 	@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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker
+-	@for base in bookmarks_icon.png desktop_icon.png index.docbook k_menu_icon.png printsys_icon.png quickbrowser_icon.png recent_docs_icon.png screenshot_left.png screenshot_right.png taskbar_group.png terminals_icon.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 \
+ 	  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 bookmarks_icon.png desktop_icon.png index.docbook k_menu_icon.png printsys_icon.png quickbrowser_icon.png recent_docs_icon.png screenshot_left.png screenshot_right.png taskbar_group.png terminals_icon.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 \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in bookmarks_icon.png desktop_icon.png index.docbook k_menu_icon.png printsys_icon.png quickbrowser_icon.png recent_docs_icon.png screenshot_left.png screenshot_right.png taskbar_group.png terminals_icon.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 \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/Makefile.in kdebase-3.4.0/doc/kinfocenter/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -535,7 +538,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. devices dma interrupts ioports memory nics opengl partitions pci pcmcia processor protocols samba scsi sound usb xserver
++SUBDIRS =. dma pci usb nics scsi interrupts devices xserver samba sound partitions memory pcmcia opengl processor ioports protocols
+ KDE_LANG = en
+ KDE_DOCS = AUTO
+ #>- all: all-recursive
+@@ -543,7 +546,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*) \
+@@ -581,9 +584,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:
+@@ -603,7 +606,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -615,7 +624,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -623,7 +632,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -644,7 +659,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/devices/Makefile.in kdebase-3.4.0/doc/kinfocenter/devices/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/devices/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/devices/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/dma/Makefile.in kdebase-3.4.0/doc/kinfocenter/dma/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/dma/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/dma/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/interrupts/Makefile.in kdebase-3.4.0/doc/kinfocenter/interrupts/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/interrupts/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/interrupts/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/ioports/Makefile.in kdebase-3.4.0/doc/kinfocenter/ioports/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/ioports/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/ioports/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/memory/Makefile.in kdebase-3.4.0/doc/kinfocenter/memory/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/memory/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/memory/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/nics/Makefile.in kdebase-3.4.0/doc/kinfocenter/nics/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/nics/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/nics/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/opengl/Makefile.in kdebase-3.4.0/doc/kinfocenter/opengl/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/opengl/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/opengl/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/partitions/Makefile.in kdebase-3.4.0/doc/kinfocenter/partitions/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/partitions/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/partitions/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/pci/Makefile.in kdebase-3.4.0/doc/kinfocenter/pci/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/pci/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/pci/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/pcmcia/Makefile.in kdebase-3.4.0/doc/kinfocenter/pcmcia/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/pcmcia/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/pcmcia/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/processor/Makefile.in kdebase-3.4.0/doc/kinfocenter/processor/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/processor/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/processor/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/protocols/Makefile.in kdebase-3.4.0/doc/kinfocenter/protocols/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/protocols/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/protocols/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/samba/Makefile.in kdebase-3.4.0/doc/kinfocenter/samba/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/samba/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/samba/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/scsi/Makefile.in kdebase-3.4.0/doc/kinfocenter/scsi/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/scsi/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/scsi/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/sound/Makefile.in kdebase-3.4.0/doc/kinfocenter/sound/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/sound/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/sound/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/usb/Makefile.in kdebase-3.4.0/doc/kinfocenter/usb/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/usb/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/usb/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kinfocenter/xserver/Makefile.in kdebase-3.4.0/doc/kinfocenter/xserver/Makefile.in
+--- kdebase-3.4.0.orig/doc/kinfocenter/xserver/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kinfocenter/xserver/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kioslave/Makefile.in kdebase-3.4.0/doc/kioslave/Makefile.in
+--- kdebase-3.4.0.orig/doc/kioslave/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kioslave/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -709,10 +712,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=finger.docbook smtp.docbook pop3s.docbook bzip2.docbook imap.docbook file.docbook bzip.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook thumbnail.docbook sftp.docbook pop3.docbook index.docbook floppy.docbook print.docbook telnet.docbook http.docbook nfs.docbook nntp.docbook gopher.docbook mac.docbook news.docbook https.docbook Makefile.in rlogin.docbook man.docbook ldap.docbook mailto.docbook help.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook rlan.docbook Makefile.am webdav.docbook lan.docbook index.cache.bz2 
++KDE_DIST=finger.docbook pop3s.docbook smtp.docbook bzip2.docbook imap.docbook bzip.docbook file.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook thumbnail.docbook sftp.docbook index.docbook pop3.docbook floppy.docbook print.docbook http.docbook telnet.docbook nfs.docbook gopher.docbook nntp.docbook mac.docbook news.docbook https.docbook Makefile.in rlogin.docbook man.docbook ldap.docbook help.docbook mailto.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook Makefile.am rlan.docbook lan.docbook webdav.docbook index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) bzip.docbook bzip2.docbook cgi.docbook data.docbook file.docbook finger.docbook fish.docbook floppy.docbook ftp.docbook gopher.docbook gzip.docbook help.docbook http.docbook https.docbook imap.docbook imaps.docbook index.docbook info.docbook lan.docbook ldap.docbook mac.docbook mailto.docbook man.docbook mrml.docbook news.docbook nfs.docbook nntp.docbook pop3.docbook pop3s.docbook print.docbook rlan.docbook rlogin.docbook sftp.docbook smb.docbook smtp.docbook tar.docbook telnet.docbook thumbnail.docbook webdav.docbook webdavs.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave
+-	@for base in bzip.docbook bzip2.docbook cgi.docbook data.docbook file.docbook finger.docbook fish.docbook floppy.docbook ftp.docbook gopher.docbook gzip.docbook help.docbook http.docbook https.docbook imap.docbook imaps.docbook index.docbook info.docbook lan.docbook ldap.docbook mac.docbook mailto.docbook man.docbook mrml.docbook news.docbook nfs.docbook nntp.docbook pop3.docbook pop3s.docbook print.docbook rlan.docbook rlogin.docbook sftp.docbook smb.docbook smtp.docbook tar.docbook telnet.docbook thumbnail.docbook webdav.docbook webdavs.docbook ; do \
++	@for base in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in bzip.docbook bzip2.docbook cgi.docbook data.docbook file.docbook finger.docbook fish.docbook floppy.docbook ftp.docbook gopher.docbook gzip.docbook help.docbook http.docbook https.docbook imap.docbook imaps.docbook index.docbook info.docbook lan.docbook ldap.docbook mac.docbook mailto.docbook man.docbook mrml.docbook news.docbook nfs.docbook nntp.docbook pop3.docbook pop3s.docbook print.docbook rlan.docbook rlogin.docbook sftp.docbook smb.docbook smtp.docbook tar.docbook telnet.docbook thumbnail.docbook webdav.docbook webdavs.docbook ; do \
++	for base in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in bzip.docbook bzip2.docbook cgi.docbook data.docbook file.docbook finger.docbook fish.docbook floppy.docbook ftp.docbook gopher.docbook gzip.docbook help.docbook http.docbook https.docbook imap.docbook imaps.docbook index.docbook info.docbook lan.docbook ldap.docbook mac.docbook mailto.docbook man.docbook mrml.docbook news.docbook nfs.docbook nntp.docbook pop3.docbook pop3s.docbook print.docbook rlan.docbook rlogin.docbook sftp.docbook smb.docbook smtp.docbook tar.docbook telnet.docbook thumbnail.docbook webdav.docbook webdavs.docbook ; do \
++	for file in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/klipper/Makefile.in kdebase-3.4.0/doc/klipper/Makefile.in
+--- kdebase-3.4.0.orig/doc/klipper/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/klipper/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -712,7 +715,7 @@
+ KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper
+-	@for base in index.docbook screenshot.png ; do \
++	@for base in screenshot.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook screenshot.png ; do \
++	for base in screenshot.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook screenshot.png ; do \
++	for file in screenshot.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kmenuedit/Makefile.in kdebase-3.4.0/doc/kmenuedit/Makefile.in
+--- kdebase-3.4.0.orig/doc/kmenuedit/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/kmenuedit/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -712,7 +715,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 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) i_copy.png i_cut.png i_delete.png i_k_button.png i_new_item.png i_new_submenu.png i_paste.png icon_sets.png index.docbook 
++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 
+ 	@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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit
+-	@for base in i_copy.png i_cut.png i_delete.png i_k_button.png i_new_item.png i_new_submenu.png i_paste.png icon_sets.png index.docbook ; 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 \
+ 	  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_copy.png i_cut.png i_delete.png i_k_button.png i_new_item.png i_new_submenu.png i_paste.png icon_sets.png index.docbook ; 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 \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in i_copy.png i_cut.png i_delete.png i_k_button.png i_new_item.png i_new_submenu.png i_paste.png icon_sets.png index.docbook ; 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 \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/knetattach/Makefile.in kdebase-3.4.0/doc/knetattach/Makefile.in
+--- kdebase-3.4.0.orig/doc/knetattach/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/knetattach/Makefile.in	2005-03-04 19:44:17.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -712,7 +715,7 @@
+ KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach
+-	@for base in index.docbook screenshot.png ; do \
++	@for base in screenshot.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook screenshot.png ; do \
++	for base in screenshot.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook screenshot.png ; do \
++	for file in screenshot.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/konqueror/Makefile.in kdebase-3.4.0/doc/konqueror/Makefile.in
+--- kdebase-3.4.0.orig/doc/konqueror/Makefile.in	2005-03-04 08:14:43.000000000 -0500
++++ kdebase-3.4.0/doc/konqueror/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -525,7 +528,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*) \
+@@ -563,9 +566,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:
+@@ -710,10 +713,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook dragdrop.png bookmarks.docbook basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png man-kbookmarkmerger.1.docbook introduction.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am index.cache.bz2 filemanager.docbook 
++KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook bookmarks.docbook dragdrop.png basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png introduction.docbook man-kbookmarkmerger.1.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am filemanager.docbook index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) basics.docbook bookmarks.docbook browser.docbook cmndline.png commands.docbook config.docbook credits.docbook dirtree.png dragdrop.png faq.docbook filemanager.docbook index.docbook introduction.docbook konqorg.png parts.png path-complete.docbook plugins.docbook save-settings.docbook shortcut1.png shortcut2.png sidebar.docbook man-kbookmarkmerger.1.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.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 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror
+-	@for base in basics.docbook bookmarks.docbook browser.docbook cmndline.png commands.docbook config.docbook credits.docbook dirtree.png dragdrop.png faq.docbook filemanager.docbook index.docbook introduction.docbook konqorg.png parts.png path-complete.docbook plugins.docbook save-settings.docbook shortcut1.png shortcut2.png sidebar.docbook man-kbookmarkmerger.1.docbook ; do \
++	@for base in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in basics.docbook bookmarks.docbook browser.docbook cmndline.png commands.docbook config.docbook credits.docbook dirtree.png dragdrop.png faq.docbook filemanager.docbook index.docbook introduction.docbook konqorg.png parts.png path-complete.docbook plugins.docbook save-settings.docbook shortcut1.png shortcut2.png sidebar.docbook man-kbookmarkmerger.1.docbook ; do \
++	for base in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in basics.docbook bookmarks.docbook browser.docbook cmndline.png commands.docbook config.docbook credits.docbook dirtree.png dragdrop.png faq.docbook filemanager.docbook index.docbook introduction.docbook konqorg.png parts.png path-complete.docbook plugins.docbook save-settings.docbook shortcut1.png shortcut2.png sidebar.docbook man-kbookmarkmerger.1.docbook ; do \
++	for file in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/konsole/Makefile.in kdebase-3.4.0/doc/konsole/Makefile.in
+--- kdebase-3.4.0.orig/doc/konsole/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/doc/konsole/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -712,7 +715,7 @@
+ KDE_DIST=index.docbook Makefile.in tabbar.png konsole.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook konsole.png tabbar.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) konsole.png index.docbook tabbar.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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole
+-	@for base in index.docbook konsole.png tabbar.png ; do \
++	@for base in konsole.png index.docbook tabbar.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook konsole.png tabbar.png ; do \
++	for base in konsole.png index.docbook tabbar.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook konsole.png tabbar.png ; do \
++	for file in konsole.png index.docbook tabbar.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/kpager/Makefile.in kdebase-3.4.0/doc/kpager/Makefile.in
+--- kdebase-3.4.0.orig/doc/kpager/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/doc/kpager/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -712,7 +715,7 @@
+ KDE_DIST=screenshot.png index.docbook Makefile.in settings.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png settings.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png settings.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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager
+-	@for base in index.docbook screenshot.png settings.png ; do \
++	@for base in screenshot.png settings.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook screenshot.png settings.png ; do \
++	for base in screenshot.png settings.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook screenshot.png settings.png ; do \
++	for file in screenshot.png settings.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/ksplashml/Makefile.in kdebase-3.4.0/doc/ksplashml/Makefile.in
+--- kdebase-3.4.0.orig/doc/ksplashml/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/doc/ksplashml/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/ksysguard/Makefile.in kdebase-3.4.0/doc/ksysguard/Makefile.in
+--- kdebase-3.4.0.orig/doc/ksysguard/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/doc/ksysguard/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kwrite/Makefile.in kdebase-3.4.0/doc/kwrite/Makefile.in
+--- kdebase-3.4.0.orig/doc/kwrite/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/doc/kwrite/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/kxkb/Makefile.in kdebase-3.4.0/doc/kxkb/Makefile.in
+--- kdebase-3.4.0.orig/doc/kxkb/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/doc/kxkb/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/quickstart/Makefile.in kdebase-3.4.0/doc/quickstart/Makefile.in
+--- kdebase-3.4.0.orig/doc/quickstart/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/doc/quickstart/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/doc/userguide/Makefile.in kdebase-3.4.0/doc/userguide/Makefile.in
+--- kdebase-3.4.0.orig/doc/userguide/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/doc/userguide/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -709,10 +712,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=rip.png kde-as-root.docbook 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 open-file-dialog.png the-filemanager.docbook 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 removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png screen-captures.docbook font-installation.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 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 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) accessibility.docbook font-installation.docbook glossary.docbook juk-icon.png index.docbook juk.png kaboodle-icon.png net-connection-setup.docbook oggfolder.png standard-menu-entries.docbook under-the-hood.docbook a-window.png amarok-icon.png amarok.png base-kde-applications.docbook browser-fine-tuning.docbook burning-cds.docbook control-center.docbook creating-graphics.docbook credits-and-license.docbook desktop.png email.docbook file-sharing.docbook getting-help.docbook internet-shortcuts.docbook kaboodle.png kcontrol.png kde-as-root.docbook kde-edutainment.docbook kde-for-admins.docbook kmag.png kmousetool.png kmouth.png kmouth2.png kmouth3.png knode-identity.png knode-mail-account.png knode-start.png konq-sidebar.png konq-simple.png konsole-intro.docbook kopete.png kppp-dialer-tab.png kppp-wizard.png messaging-intro.docbook migrator-dictionary.docbook networking-with-windows.docbook noatun-icon.png noatun.png panel-and-desktop.docbook pdf-files.docbook playing-movies.docbook playing-music.docbook printer-setup.docbook printing-from-apps.docbook programs-and-documents.docbook programs-controlling.docbook removable-disks.docbook rip.png ripsettings.png screen-captures.docbook services.png shared-sessions.docbook switching-sessions.docbook the-filemanager.docbook titlebar-menu.png troubleshooting-no-open.docbook usenet.docbook where-next.docbook windows-how-to.docbook your-kde-account.docbook open-file-dialog.png troubleshooting-network-x.docbook groupware-kontact.docbook kde-office.docbook playing-audiocds.docbook 
++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 
+ 	@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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
+-	@for base in accessibility.docbook font-installation.docbook glossary.docbook juk-icon.png index.docbook juk.png kaboodle-icon.png net-connection-setup.docbook oggfolder.png standard-menu-entries.docbook under-the-hood.docbook a-window.png amarok-icon.png amarok.png base-kde-applications.docbook browser-fine-tuning.docbook burning-cds.docbook control-center.docbook creating-graphics.docbook credits-and-license.docbook desktop.png email.docbook file-sharing.docbook getting-help.docbook internet-shortcuts.docbook kaboodle.png kcontrol.png kde-as-root.docbook kde-edutainment.docbook kde-for-admins.docbook kmag.png kmousetool.png kmouth.png kmouth2.png kmouth3.png knode-identity.png knode-mail-account.png knode-start.png konq-sidebar.png konq-simple.png konsole-intro.docbook kopete.png kppp-dialer-tab.png kppp-wizard.png messaging-intro.docbook migrator-dictionary.docbook networking-with-windows.docbook noatun-icon.png noatun.png panel-and-desktop.docbook pdf-files.docbook playing-movies.docbook playing-music.docbook printer-setup.docbook printing-from-apps.docbook programs-and-documents.docbook programs-controlling.docbook removable-disks.docbook rip.png ripsettings.png screen-captures.docbook services.png shared-sessions.docbook switching-sessions.docbook the-filemanager.docbook titlebar-menu.png troubleshooting-no-open.docbook usenet.docbook where-next.docbook windows-how-to.docbook your-kde-account.docbook open-file-dialog.png troubleshooting-network-x.docbook groupware-kontact.docbook kde-office.docbook playing-audiocds.docbook ; 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 \
+ 	  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 accessibility.docbook font-installation.docbook glossary.docbook juk-icon.png index.docbook juk.png kaboodle-icon.png net-connection-setup.docbook oggfolder.png standard-menu-entries.docbook under-the-hood.docbook a-window.png amarok-icon.png amarok.png base-kde-applications.docbook browser-fine-tuning.docbook burning-cds.docbook control-center.docbook creating-graphics.docbook credits-and-license.docbook desktop.png email.docbook file-sharing.docbook getting-help.docbook internet-shortcuts.docbook kaboodle.png kcontrol.png kde-as-root.docbook kde-edutainment.docbook kde-for-admins.docbook kmag.png kmousetool.png kmouth.png kmouth2.png kmouth3.png knode-identity.png knode-mail-account.png knode-start.png konq-sidebar.png konq-simple.png konsole-intro.docbook kopete.png kppp-dialer-tab.png kppp-wizard.png messaging-intro.docbook migrator-dictionary.docbook networking-with-windows.docbook noatun-icon.png noatun.png panel-and-desktop.docbook pdf-files.docbook playing-movies.docbook playing-music.docbook printer-setup.docbook printing-from-apps.docbook programs-and-documents.docbook programs-controlling.docbook removable-disks.docbook rip.png ripsettings.png screen-captures.docbook services.png shared-sessions.docbook switching-sessions.docbook the-filemanager.docbook titlebar-menu.png troubleshooting-no-open.docbook usenet.docbook where-next.docbook windows-how-to.docbook your-kde-account.docbook open-file-dialog.png troubleshooting-network-x.docbook groupware-kontact.docbook kde-office.docbook playing-audiocds.docbook ; 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 \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in accessibility.docbook font-installation.docbook glossary.docbook juk-icon.png index.docbook juk.png kaboodle-icon.png net-connection-setup.docbook oggfolder.png standard-menu-entries.docbook under-the-hood.docbook a-window.png amarok-icon.png amarok.png base-kde-applications.docbook browser-fine-tuning.docbook burning-cds.docbook control-center.docbook creating-graphics.docbook credits-and-license.docbook desktop.png email.docbook file-sharing.docbook getting-help.docbook internet-shortcuts.docbook kaboodle.png kcontrol.png kde-as-root.docbook kde-edutainment.docbook kde-for-admins.docbook kmag.png kmousetool.png kmouth.png kmouth2.png kmouth3.png knode-identity.png knode-mail-account.png knode-start.png konq-sidebar.png konq-simple.png konsole-intro.docbook kopete.png kppp-dialer-tab.png kppp-wizard.png messaging-intro.docbook migrator-dictionary.docbook networking-with-windows.docbook noatun-icon.png noatun.png panel-and-desktop.docbook pdf-files.docbook playing-movies.docbook playing-music.docbook printer-setup.docbook printing-from-apps.docbook programs-and-documents.docbook programs-controlling.docbook removable-disks.docbook rip.png ripsettings.png screen-captures.docbook services.png shared-sessions.docbook switching-sessions.docbook the-filemanager.docbook titlebar-menu.png troubleshooting-no-open.docbook usenet.docbook where-next.docbook windows-how-to.docbook your-kde-account.docbook open-file-dialog.png troubleshooting-network-x.docbook groupware-kontact.docbook kde-office.docbook playing-audiocds.docbook ; 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 \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/doc/visualdict/Makefile.in kdebase-3.4.0/doc/visualdict/Makefile.in
+--- kdebase-3.4.0.orig/doc/visualdict/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/doc/visualdict/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -709,10 +712,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 pict20.png pict16.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 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook pict1.png pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict2.png pict20.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 
+ 	@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
+@@ -739,20 +742,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict
+-	@for base in index.docbook pict1.png pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict2.png pict20.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 \
+ 	  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 pict1.png pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict2.png pict20.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 \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook pict1.png pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict2.png pict20.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 \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nrua kdebase-3.4.0.orig/drkonqi/Makefile.in kdebase-3.4.0/drkonqi/Makefile.in
+--- kdebase-3.4.0.orig/drkonqi/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/drkonqi/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -83,18 +83,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(crashtest_SOURCES) $(drkonqi_SOURCES)
+ DIST_SOURCES = $(crashtest_SOURCES) $(drkonqi_SOURCES)
+@@ -300,6 +300,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@
+@@ -604,7 +607,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*) \
+@@ -642,9 +645,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -740,7 +743,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -752,7 +761,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -760,7 +769,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -781,7 +796,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1009,13 +1024,6 @@
+ .NOEXPORT:
+ 
+ #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+-	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+-
+-#>+ 2
+-mocs: toplevel.moc
+-
+-#>+ 3
+ debugger.moc: $(srcdir)/debugger.h
+ 	$(MOC) $(srcdir)/debugger.h -o debugger.moc
+ 
+@@ -1030,6 +1038,13 @@
+ mocs: backtrace.moc
+ 
+ #>+ 3
++toplevel.moc: $(srcdir)/toplevel.h
++	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++
++#>+ 2
++mocs: toplevel.moc
++
++#>+ 3
+ drbugreport.moc: $(srcdir)/drbugreport.h
+ 	$(MOC) $(srcdir)/drbugreport.h -o drbugreport.moc
+ 
+@@ -1051,7 +1066,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  toplevel.moc debugger.moc backtrace.moc drbugreport.moc krashconf.moc
++	-rm -f  debugger.moc backtrace.moc toplevel.moc drbugreport.moc krashconf.moc
+ 
+ #>+ 2
+ KDE_DIST=backtrace.h toplevel.h drbugreport.h Makefile.in krashdcopinterface.h krashconf.h debugger.h Makefile.am 
+@@ -1103,7 +1118,7 @@
+ 
+ 
+ #>+ 11
+-drkonqi.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/debugger.cpp $(srcdir)/krashconf.cpp $(srcdir)/drbugreport.cpp $(srcdir)/backtrace.cpp $(srcdir)/toplevel.cpp krashdcopinterface_skel.cpp  backtrace.moc debugger.moc toplevel.moc drbugreport.moc krashconf.moc
++drkonqi.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/debugger.cpp $(srcdir)/krashconf.cpp $(srcdir)/drbugreport.cpp $(srcdir)/backtrace.cpp $(srcdir)/toplevel.cpp krashdcopinterface_skel.cpp  toplevel.moc backtrace.moc debugger.moc drbugreport.moc krashconf.moc
+ 	@echo 'creating drkonqi.all_cpp.cpp ...'; \
+ 	rm -f drkonqi.all_cpp.files drkonqi.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> drkonqi.all_cpp.final; \
+diff -Nrua kdebase-3.4.0.orig/drkonqi/debuggers/Makefile.in kdebase-3.4.0/drkonqi/debuggers/Makefile.in
+--- kdebase-3.4.0.orig/drkonqi/debuggers/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/drkonqi/debuggers/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/drkonqi/pics/Makefile.in kdebase-3.4.0/drkonqi/pics/Makefile.in
+--- kdebase-3.4.0.orig/drkonqi/pics/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/drkonqi/pics/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/drkonqi/presets/Makefile.in kdebase-3.4.0/drkonqi/presets/Makefile.in
+--- kdebase-3.4.0.orig/drkonqi/presets/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/drkonqi/presets/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/Makefile.in kdebase-3.4.0/kappfinder/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -85,18 +85,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kappfinder_SOURCES) $(kappfinder_install_SOURCES)
+ DIST_SOURCES = $(kappfinder_SOURCES) $(kappfinder_install_SOURCES)
+@@ -310,6 +310,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -759,7 +762,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -771,7 +780,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -779,7 +788,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -800,7 +815,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1065,23 +1080,23 @@
+ 
+ #>+ 19
+ 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/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/crystalsvg/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/16x16/apps/kappfinder.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kappfinder.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kappfinder.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kappfinder.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kappfinder.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Development/Makefile.in kdebase-3.4.0/kappfinder/apps/Development/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Development/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Development/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -537,7 +540,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*) \
+@@ -575,9 +578,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Editors/Makefile.in kdebase-3.4.0/kappfinder/apps/Editors/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Editors/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Editors/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -538,7 +541,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*) \
+@@ -576,9 +579,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:
+@@ -738,7 +741,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=nano.desktop gedit.desktop xemacs.desktop pico.desktop xedit.desktop lemacs.desktop nedit.desktop gvim.desktop emacs.desktop Makefile.in Makefile.am 
++KDE_DIST=gedit.desktop nano.desktop xemacs.desktop pico.desktop xedit.desktop lemacs.desktop nedit.desktop gvim.desktop emacs.desktop Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Arcade/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Arcade/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Games/Arcade/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Arcade/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Board/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Board/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Games/Board/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Board/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -538,7 +541,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*) \
+@@ -576,9 +579,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Card/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Card/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Games/Card/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Card/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Emulators/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Emulators/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Games/Emulators/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Emulators/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Games/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -261,6 +261,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@
+@@ -554,7 +557,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*) \
+@@ -592,9 +595,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:
+@@ -631,7 +634,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -643,7 +652,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -651,7 +660,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -672,7 +687,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/Roguelikes/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/Roguelikes/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Games/Roguelikes/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/Roguelikes/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -537,7 +540,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*) \
+@@ -575,9 +578,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in kdebase-3.4.0/kappfinder/apps/Games/TacticStrategy/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Games/TacticStrategy/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Graphics/Makefile.in kdebase-3.4.0/kappfinder/apps/Graphics/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Graphics/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Graphics/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Internet/Makefile.in kdebase-3.4.0/kappfinder/apps/Internet/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Internet/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Internet/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -261,6 +261,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@
+@@ -563,7 +566,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*) \
+@@ -601,9 +604,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:
+@@ -640,7 +643,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -652,7 +661,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -660,7 +669,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -681,7 +696,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -900,7 +915,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 mozilla-firefox.desktop Netscapemessenger.desktop Gabber.desktop mozilla.desktop ickle.desktop gnometalk.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 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 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Internet/Terminal/Makefile.in kdebase-3.4.0/kappfinder/apps/Internet/Terminal/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Internet/Terminal/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Internet/Terminal/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -538,7 +541,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*) \
+@@ -576,9 +579,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Makefile.in kdebase-3.4.0/kappfinder/apps/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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-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*) \
+@@ -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:
+@@ -601,7 +604,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -613,7 +622,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -621,7 +630,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -642,7 +657,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Multimedia/Makefile.in kdebase-3.4.0/kappfinder/apps/Multimedia/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Multimedia/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Multimedia/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -561,7 +564,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*) \
+@@ -599,9 +602,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:
+@@ -763,7 +766,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=bcast2000.desktop XMovie.desktop xcam.desktop ogle.desktop alsamixergui.desktop slab.desktop alevt.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop xawtv.desktop Aumix.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am 
++KDE_DIST=XMovie.desktop bcast2000.desktop xcam.desktop ogle.desktop alsamixergui.desktop slab.desktop alevt.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop Aumix.desktop xawtv.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Office/Makefile.in kdebase-3.4.0/kappfinder/apps/Office/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Office/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Office/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -542,7 +545,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*) \
+@@ -580,9 +583,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:
+@@ -742,7 +745,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop pybliographic.desktop gnucash.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop lyx.desktop acroread.desktop Makefile.in scribus.desktop mrproject.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop 
++KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop gnucash.desktop pybliographic.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop acroread.desktop lyx.desktop Makefile.in scribus.desktop mrproject.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/System/Makefile.in kdebase-3.4.0/kappfinder/apps/System/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/System/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/System/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -261,6 +261,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@
+@@ -554,7 +557,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*) \
+@@ -592,9 +595,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:
+@@ -631,7 +634,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -643,7 +652,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -651,7 +660,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -672,7 +687,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/System/Terminal/Makefile.in kdebase-3.4.0/kappfinder/apps/System/Terminal/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/System/Terminal/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/System/Terminal/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Toys/Makefile.in kdebase-3.4.0/kappfinder/apps/Toys/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Toys/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Toys/Makefile.in	2005-03-04 19:44:18.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Utilities/Makefile.in kdebase-3.4.0/kappfinder/apps/Utilities/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Utilities/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Utilities/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -261,6 +261,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@
+@@ -554,7 +557,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*) \
+@@ -592,9 +595,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:
+@@ -631,7 +634,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -643,7 +652,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -651,7 +660,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -672,7 +687,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kappfinder/apps/Utilities/xutils/Makefile.in kdebase-3.4.0/kappfinder/apps/Utilities/xutils/Makefile.in
+--- kdebase-3.4.0.orig/kappfinder/apps/Utilities/xutils/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kappfinder/apps/Utilities/xutils/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -538,7 +541,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*) \
+@@ -576,9 +579,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:
+diff -Nrua kdebase-3.4.0.orig/kate/Makefile.in kdebase-3.4.0/kate/Makefile.in
+--- kdebase-3.4.0.orig/kate/Makefile.in	2005-03-04 08:14:44.000000000 -0500
++++ kdebase-3.4.0/kate/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -253,6 +253,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@
+@@ -542,7 +545,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -580,9 +583,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:
+@@ -602,7 +605,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -614,7 +623,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -622,7 +631,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -643,7 +658,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kate/app/Makefile.in kdebase-3.4.0/kate/app/Makefile.in
+--- kdebase-3.4.0.orig/kate/app/Makefile.in	2005-03-04 08:14:45.000000000 -0500
++++ kdebase-3.4.0/kate/app/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -125,18 +125,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \
+ 	$(libkateinterfaces_la_SOURCES)
+@@ -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@
+@@ -663,7 +666,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*) \
+@@ -701,9 +704,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)
+@@ -1111,18 +1114,18 @@
+ mocs: kateconfigdialog.moc
+ 
+ #>+ 3
+-katemainwindow.moc: $(srcdir)/katemainwindow.h
+-	$(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc
++kateconsole.moc: $(srcdir)/kateconsole.h
++	$(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc
+ 
+ #>+ 2
+-mocs: katemainwindow.moc
++mocs: kateconsole.moc
+ 
+ #>+ 3
+-kateconsole.moc: $(srcdir)/kateconsole.h
+-	$(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc
++katemainwindow.moc: $(srcdir)/katemainwindow.h
++	$(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc
+ 
+ #>+ 2
+-mocs: kateconsole.moc
++mocs: katemainwindow.moc
+ 
+ #>+ 3
+ katedocmanager.moc: $(srcdir)/katedocmanager.h
+@@ -1132,6 +1135,13 @@
+ mocs: katedocmanager.moc
+ 
+ #>+ 3
++kategrepdialog.moc: $(srcdir)/kategrepdialog.h
++	$(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
++
++#>+ 2
++mocs: kategrepdialog.moc
++
++#>+ 3
+ kateprojecttreeview.moc: $(srcdir)/kateprojecttreeview.h
+ 	$(MOC) $(srcdir)/kateprojecttreeview.h -o kateprojecttreeview.moc
+ 
+@@ -1146,13 +1156,6 @@
+ mocs: kateprojectlist.moc
+ 
+ #>+ 3
+-kategrepdialog.moc: $(srcdir)/kategrepdialog.h
+-	$(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
+-
+-#>+ 2
+-mocs: kategrepdialog.moc
+-
+-#>+ 3
+ kwritemain.moc: $(srcdir)/kwritemain.h
+ 	$(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc
+ 
+@@ -1296,10 +1299,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  katesavemodifieddialog.moc kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kateprojecttreeview.moc kateprojectlist.moc kategrepdialog.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 katesavemodifieddialog.h Makefile.am kateprojectlist.h kategrepdialog.h 
++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 
+ 
+ #>+ 6
+ clean-idl:
+@@ -1354,7 +1357,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 kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc kateprojectlist.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; \
+diff -Nrua kdebase-3.4.0.orig/kate/data/Makefile.in kdebase-3.4.0/kate/data/Makefile.in
+--- kdebase-3.4.0.orig/kate/data/Makefile.in	2005-03-04 08:14:45.000000000 -0500
++++ kdebase-3.4.0/kate/data/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -263,6 +263,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@
+@@ -567,7 +570,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*) \
+@@ -605,9 +608,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-katescriptsSCRIPTS: $(katescripts_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+@@ -936,7 +939,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=sample.desktop sample.sh externaltools kate-2.4.upd kwriteui.rc kwrite.desktop tips kateui.rc kate.desktop kateplugin.desktop kateprojectplugin.desktop Makefile.in katerc kateinitplugin.desktop x-kate-project.desktop Makefile.am 
++KDE_DIST=sample.desktop sample.sh externaltools kate-2.4.upd kwriteui.rc kwrite.desktop tips kateui.rc kate.desktop kateplugin.desktop kateprojectplugin.desktop Makefile.in kateinitplugin.desktop katerc x-kate-project.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kate/interfaces/Makefile.in kdebase-3.4.0/kate/interfaces/Makefile.in
+--- kdebase-3.4.0.orig/kate/interfaces/Makefile.in	2005-03-04 08:14:45.000000000 -0500
++++ kdebase-3.4.0/kate/interfaces/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkateinterfacesprivate_la_SOURCES)
+ DIST_SOURCES = $(libkateinterfacesprivate_la_SOURCES)
+@@ -288,6 +288,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@
+@@ -591,7 +594,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*) \
+@@ -629,9 +632,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:
+diff -Nrua kdebase-3.4.0.orig/kate/pics/Makefile.in kdebase-3.4.0/kate/pics/Makefile.in
+--- kdebase-3.4.0.orig/kate/pics/Makefile.in	2005-03-04 08:14:45.000000000 -0500
++++ kdebase-3.4.0/kate/pics/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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:
+@@ -600,7 +603,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -612,7 +621,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -620,7 +629,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -641,7 +656,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -867,37 +882,37 @@
+ #>+ 34
+ install-kde-icons:
+ 	$(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)/cr128-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwrite.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwrite.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
++	$(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-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/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)/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
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-kate.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kate.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kwrite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwrite.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kate2.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwrite2.svgz
++	$(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
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kate.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwrite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kate.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwrite.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/scalable/apps/kwrite2.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwrite.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kate.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/64x64/apps/kwrite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kate2.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwrite2.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kate.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwrite.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/kate/pics/actions/Makefile.in kdebase-3.4.0/kate/pics/actions/Makefile.in
+--- kdebase-3.4.0.orig/kate/pics/actions/Makefile.in	2005-03-04 08:14:45.000000000 -0500
++++ kdebase-3.4.0/kate/pics/actions/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -714,43 +717,43 @@
+ 
+ #>+ 40
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
++	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-modmod.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
+-	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
+-	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
+ 	$(INSTALL_DATA) $(srcdir)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
+ 	$(INSTALL_DATA) $(srcdir)/lo16-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions
+ 	$(INSTALL_DATA) $(srcdir)/lo22-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
+ 	$(INSTALL_DATA) $(srcdir)/lo22-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+ 
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+ 
+ #>+ 15
+diff -Nrua kdebase-3.4.0.orig/kate/plugins/Makefile.in kdebase-3.4.0/kate/plugins/Makefile.in
+--- kdebase-3.4.0.orig/kate/plugins/Makefile.in	2005-03-04 08:14:45.000000000 -0500
++++ kdebase-3.4.0/kate/plugins/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+@@ -599,7 +602,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -611,7 +620,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -619,7 +628,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -640,7 +655,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kate/plugins/defaultproject/Makefile.in kdebase-3.4.0/kate/plugins/defaultproject/Makefile.in
+--- kdebase-3.4.0.orig/kate/plugins/defaultproject/Makefile.in	2005-03-04 08:14:45.000000000 -0500
++++ kdebase-3.4.0/kate/plugins/defaultproject/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(katedefaultprojectplugin_la_SOURCES)
+ DIST_SOURCES = $(katedefaultprojectplugin_la_SOURCES)
+@@ -282,6 +282,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@
+@@ -584,7 +587,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*) \
+@@ -622,9 +625,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)
+diff -Nrua kdebase-3.4.0.orig/kate/utils/Makefile.in kdebase-3.4.0/kate/utils/Makefile.in
+--- kdebase-3.4.0.orig/kate/utils/Makefile.in	2005-03-04 08:14:45.000000000 -0500
++++ kdebase-3.4.0/kate/utils/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkateutils_la_SOURCES)
+ DIST_SOURCES = $(libkateutils_la_SOURCES)
+@@ -287,6 +287,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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)
+diff -Nrua kdebase-3.4.0.orig/kcheckpass/Makefile.in kdebase-3.4.0/kcheckpass/Makefile.in
+--- kdebase-3.4.0.orig/kcheckpass/Makefile.in	2005-03-04 08:14:45.000000000 -0500
++++ kdebase-3.4.0/kcheckpass/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,11 +76,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcheckpass_SOURCES)
+ DIST_SOURCES = $(kcheckpass_SOURCES)
+@@ -273,6 +273,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@
+@@ -571,7 +574,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -609,9 +612,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kcminit/Makefile.in kdebase-3.4.0/kcminit/Makefile.in
+--- kdebase-3.4.0.orig/kcminit/Makefile.in	2005-03-04 08:14:45.000000000 -0500
++++ kdebase-3.4.0/kcminit/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -107,18 +107,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcminit_la_SOURCES)
+ #>- DIST_SOURCES = $(kcminit_la_SOURCES)
+@@ -312,6 +312,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
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/Makefile.in kdebase-3.4.0/kcontrol/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/Makefile.in	2005-03-04 08:14:45.000000000 -0500
++++ kdebase-3.4.0/kcontrol/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -257,6 +257,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@
+@@ -563,7 +566,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*) \
+@@ -601,9 +604,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:
+@@ -623,7 +626,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -635,7 +644,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -643,7 +652,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -664,7 +679,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/access/Makefile.in kdebase-3.4.0/kcontrol/access/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/access/Makefile.in	2005-03-04 08:14:46.000000000 -0500
++++ kdebase-3.4.0/kcontrol/access/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -100,18 +100,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES)
+ #>- DIST_SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES)
+@@ -309,6 +309,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@
+@@ -618,7 +621,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*) \
+@@ -656,9 +659,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/accessibility/Makefile.in kdebase-3.4.0/kcontrol/accessibility/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/accessibility/Makefile.in	2005-03-04 08:14:46.000000000 -0500
++++ kdebase-3.4.0/kcontrol/accessibility/Makefile.in	2005-03-04 19:44:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_accessibility_la_SOURCES)
+ DIST_SOURCES = $(kcm_accessibility_la_SOURCES)
+@@ -286,6 +286,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/arts/Makefile.in kdebase-3.4.0/kcontrol/arts/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/arts/Makefile.in	2005-03-04 08:14:46.000000000 -0500
++++ kdebase-3.4.0/kcontrol/arts/Makefile.in	2005-03-04 19:44:20.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_arts_la_SOURCES)
+ DIST_SOURCES = $(kcm_arts_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -582,7 +585,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*) \
+@@ -620,9 +623,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/background/Makefile.in kdebase-3.4.0/kcontrol/background/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/background/Makefile.in	2005-03-04 08:14:47.000000000 -0500
++++ kdebase-3.4.0/kcontrol/background/Makefile.in	2005-03-04 19:44:20.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -96,18 +96,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_background_la_SOURCES) $(libbgnd_la_SOURCES) \
+ 	$(libkcmbgnd_la_SOURCES)
+@@ -318,6 +318,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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -785,7 +788,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -797,7 +806,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -805,7 +814,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -826,7 +841,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1087,18 +1102,18 @@
+ mocs: bgrender.moc
+ 
+ #>+ 3
+-bgmonitor.moc: $(srcdir)/bgmonitor.h
+-	$(MOC) $(srcdir)/bgmonitor.h -o bgmonitor.moc
++bgadvanced.moc: $(srcdir)/bgadvanced.h
++	$(MOC) $(srcdir)/bgadvanced.h -o bgadvanced.moc
+ 
+ #>+ 2
+-mocs: bgmonitor.moc
++mocs: bgadvanced.moc
+ 
+ #>+ 3
+-bgadvanced.moc: $(srcdir)/bgadvanced.h
+-	$(MOC) $(srcdir)/bgadvanced.h -o bgadvanced.moc
++bgmonitor.moc: $(srcdir)/bgmonitor.h
++	$(MOC) $(srcdir)/bgmonitor.h -o bgmonitor.moc
+ 
+ #>+ 2
+-mocs: bgadvanced.moc
++mocs: bgmonitor.moc
+ 
+ #>+ 3
+ bgdialog.moc: $(srcdir)/bgdialog.h
+@@ -1116,7 +1131,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  bgwallpaper.moc bgrender.moc bgmonitor.moc bgadvanced.moc bgdialog.moc main.moc
++	-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 
+diff -Nrua kdebase-3.4.0.orig/kcontrol/background/pics/Makefile.in kdebase-3.4.0/kcontrol/background/pics/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/background/pics/Makefile.in	2005-03-04 08:14:47.000000000 -0500
++++ kdebase-3.4.0/kcontrol/background/pics/Makefile.in	2005-03-04 19:44:20.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/bell/Makefile.in kdebase-3.4.0/kcontrol/bell/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/bell/Makefile.in	2005-03-04 08:14:47.000000000 -0500
++++ kdebase-3.4.0/kcontrol/bell/Makefile.in	2005-03-04 19:44:20.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -74,18 +74,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_bell_la_SOURCES)
+ DIST_SOURCES = $(kcm_bell_la_SOURCES)
+@@ -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@
+@@ -576,7 +579,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*) \
+@@ -614,9 +617,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/clock/Makefile.in kdebase-3.4.0/kcontrol/clock/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/clock/Makefile.in	2005-03-04 08:14:47.000000000 -0500
++++ kdebase-3.4.0/kcontrol/clock/Makefile.in	2005-03-04 19:44:20.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_clock_la_SOURCES)
+ DIST_SOURCES = $(kcm_clock_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -580,7 +583,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*) \
+@@ -618,9 +621,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/colors/Makefile.in kdebase-3.4.0/kcontrol/colors/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/colors/Makefile.in	2005-03-04 08:14:47.000000000 -0500
++++ kdebase-3.4.0/kcontrol/colors/Makefile.in	2005-03-04 19:44:20.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_colors_la_SOURCES)
+ DIST_SOURCES = $(kcm_colors_la_SOURCES)
+@@ -287,6 +287,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@
+@@ -585,7 +588,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*) \
+@@ -623,9 +626,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/componentchooser/Makefile.in kdebase-3.4.0/kcontrol/componentchooser/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/componentchooser/Makefile.in	2005-03-04 08:14:47.000000000 -0500
++++ kdebase-3.4.0/kcontrol/componentchooser/Makefile.in	2005-03-04 19:44:20.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_componentchooser_la_SOURCES)
+ DIST_SOURCES = $(kcm_componentchooser_la_SOURCES)
+@@ -300,6 +300,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@
+@@ -600,7 +603,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*) \
+@@ -638,9 +641,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)
+@@ -739,7 +742,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -751,7 +760,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -759,7 +768,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -780,7 +795,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1040,7 +1055,7 @@
+ 	-rm -f  componentchooser.moc kcm_componentchooser.moc
+ 
+ #>+ 2
+-KDE_DIST=browserconfig_ui.ui kcm_componentchooser.h emailclientconfig_ui.ui componentconfig_ui.ui terminalemulatorconfig_ui.ui EXAMPLE.desktop componentchooser_ui.ui Makefile.in componentchooser.desktop Makefile.am componentchooser.h 
++KDE_DIST=browserconfig_ui.ui kcm_componentchooser.h emailclientconfig_ui.ui componentconfig_ui.ui terminalemulatorconfig_ui.ui EXAMPLE.desktop componentchooser_ui.ui componentchooser.desktop Makefile.in Makefile.am componentchooser.h 
+ 
+ #>+ 8
+ clean-ui:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/componentchooser/componentservices/Makefile.in kdebase-3.4.0/kcontrol/componentchooser/componentservices/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/componentchooser/componentservices/Makefile.in	2005-03-04 08:14:47.000000000 -0500
++++ kdebase-3.4.0/kcontrol/componentchooser/componentservices/Makefile.in	2005-03-04 19:44:20.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/crypto/Makefile.in kdebase-3.4.0/kcontrol/crypto/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/crypto/Makefile.in	2005-03-04 08:14:47.000000000 -0500
++++ kdebase-3.4.0/kcontrol/crypto/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_crypto_la_SOURCES)
+ DIST_SOURCES = $(kcm_crypto_la_SOURCES)
+@@ -287,6 +287,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@
+@@ -585,7 +588,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*) \
+@@ -623,9 +626,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/css/Makefile.in kdebase-3.4.0/kcontrol/css/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/css/Makefile.in	2005-03-04 08:14:48.000000000 -0500
++++ kdebase-3.4.0/kcontrol/css/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_css_la_SOURCES)
+ DIST_SOURCES = $(kcm_css_la_SOURCES)
+@@ -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@
+@@ -585,7 +588,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*) \
+@@ -623,9 +626,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/display/Makefile.in kdebase-3.4.0/kcontrol/display/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/display/Makefile.in	2005-03-04 08:14:48.000000000 -0500
++++ kdebase-3.4.0/kcontrol/display/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_display_la_SOURCES)
+ DIST_SOURCES = $(kcm_display_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/dnssd/Makefile.in kdebase-3.4.0/kcontrol/dnssd/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/dnssd/Makefile.in	2005-03-04 08:14:48.000000000 -0500
++++ kdebase-3.4.0/kcontrol/dnssd/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,26 +79,26 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_kdnssd_la_SOURCES)
+ DIST_SOURCES = $(kcm_kdnssd_la_SOURCES)
+@@ -292,6 +292,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@
+@@ -591,7 +594,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*) \
+@@ -629,9 +632,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/ebrowsing/Makefile.in	2005-03-04 08:14:48.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_kurifilt_la_SOURCES)
+ DIST_SOURCES = $(kcm_kurifilt_la_SOURCES)
+@@ -297,6 +297,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@
+@@ -595,7 +598,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*) \
+@@ -633,9 +636,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)
+@@ -734,7 +737,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -746,7 +755,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -754,7 +763,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -775,7 +790,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/Makefile.in	2005-03-04 08:14:48.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+@@ -599,7 +602,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -611,7 +620,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -619,7 +628,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -640,7 +655,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in	2005-03-04 08:14:49.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -95,18 +95,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkuriikwsfilter_la_SOURCES) \
+ 	$(libkurisearchfilter_la_SOURCES)
+@@ -318,6 +318,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@
+@@ -634,7 +637,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*) \
+@@ -672,9 +675,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)
+@@ -816,7 +819,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -828,7 +837,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -836,7 +845,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -857,7 +872,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in	2005-03-04 08:14:49.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -619,7 +622,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*) \
+@@ -657,9 +660,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:
+@@ -819,7 +822,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-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 jeeves.desktop google_lucky.desktop msdn.desktop doi.desktop alexa_url.desktop kde_webcvs.desktop bugno.desktop dmoz.desktop google.desktop en2fr.desktop acronym.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 en2it.desktop cpan.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop thesaurus.desktop pgpkeys.desktop php.desktop nl-telephone.desktop foldoc.desktop feedster.desktop en2de.desktop google_news.desktop dbug.desktop qt.desktop rfc.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop metacrawler.desktop fr2en.desktop excite.desktop ctan.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop python.desktop altavista.desktop grec.desktop voila.desktop seek.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 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/localdomain/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in	2005-03-04 08:14:49.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/localdomain/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -88,29 +88,29 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(liblocaldomainurifilter_la_SOURCES) \
+ 	$(klocaldomainurifilterhelper_SOURCES)
+@@ -306,6 +306,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@
+@@ -607,7 +610,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -645,9 +648,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in kdebase-3.4.0/kcontrol/ebrowsing/plugins/shorturi/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in	2005-03-04 08:14:49.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ebrowsing/plugins/shorturi/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkshorturifilter_la_SOURCES)
+ DIST_SOURCES = $(libkshorturifilter_la_SOURCES)
+@@ -285,6 +285,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/energy/Makefile.in kdebase-3.4.0/kcontrol/energy/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/energy/Makefile.in	2005-03-04 08:14:49.000000000 -0500
++++ kdebase-3.4.0/kcontrol/energy/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_energy_la_SOURCES)
+ DIST_SOURCES = $(kcm_energy_la_SOURCES)
+@@ -298,6 +298,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@
+@@ -598,7 +601,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*) \
+@@ -636,9 +639,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)
+@@ -736,7 +739,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -748,7 +757,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -756,7 +765,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -777,7 +792,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/energy/pics/Makefile.in kdebase-3.4.0/kcontrol/energy/pics/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/energy/pics/Makefile.in	2005-03-04 08:14:49.000000000 -0500
++++ kdebase-3.4.0/kcontrol/energy/pics/Makefile.in	2005-03-04 19:44:21.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/filetypes/Makefile.in kdebase-3.4.0/kcontrol/filetypes/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/filetypes/Makefile.in	2005-03-04 08:14:49.000000000 -0500
++++ kdebase-3.4.0/kcontrol/filetypes/Makefile.in	2005-03-04 19:44:22.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -98,18 +98,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_filetypes_la_SOURCES) $(libfiletypes_la_SOURCES) \
+ 	$(keditfiletype_SOURCES)
+@@ -306,6 +306,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@
+@@ -615,7 +618,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*) \
+@@ -653,9 +656,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)
+@@ -1016,18 +1019,18 @@
+ mocs: filetypesview.moc
+ 
+ #>+ 3
+-keditfiletype.moc: $(srcdir)/keditfiletype.h
+-	$(MOC) $(srcdir)/keditfiletype.h -o keditfiletype.moc
++filegroupdetails.moc: $(srcdir)/filegroupdetails.h
++	$(MOC) $(srcdir)/filegroupdetails.h -o filegroupdetails.moc
+ 
+ #>+ 2
+-mocs: keditfiletype.moc
++mocs: filegroupdetails.moc
+ 
+ #>+ 3
+-filegroupdetails.moc: $(srcdir)/filegroupdetails.h
+-	$(MOC) $(srcdir)/filegroupdetails.h -o filegroupdetails.moc
++keditfiletype.moc: $(srcdir)/keditfiletype.h
++	$(MOC) $(srcdir)/keditfiletype.h -o keditfiletype.moc
+ 
+ #>+ 2
+-mocs: filegroupdetails.moc
++mocs: keditfiletype.moc
+ 
+ #>+ 3
+ kserviceselectdlg.moc: $(srcdir)/kserviceselectdlg.h
+@@ -1038,7 +1041,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kservicelistwidget.moc filetypedetails.moc filetypesview.moc keditfiletype.moc filegroupdetails.moc kserviceselectdlg.moc
++	-rm -f  kservicelistwidget.moc filetypedetails.moc filetypesview.moc filegroupdetails.moc keditfiletype.moc kserviceselectdlg.moc
+ 
+ #>+ 2
+ KDE_DIST=filetypes.desktop keditfiletype.h Makefile.in Makefile.am 
+diff -Nrua kdebase-3.4.0.orig/kcontrol/fonts/Makefile.in kdebase-3.4.0/kcontrol/fonts/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/fonts/Makefile.in	2005-03-04 08:14:49.000000000 -0500
++++ kdebase-3.4.0/kcontrol/fonts/Makefile.in	2005-03-04 19:44:22.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -84,18 +84,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_fonts_la_SOURCES) $(libkxftconfig_la_SOURCES)
+ DIST_SOURCES = $(kcm_fonts_la_SOURCES) $(libkxftconfig_la_SOURCES)
+@@ -290,6 +290,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@
+@@ -592,7 +595,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*) \
+@@ -630,9 +633,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/icons/Makefile.in kdebase-3.4.0/kcontrol/icons/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/icons/Makefile.in	2005-03-04 08:14:50.000000000 -0500
++++ kdebase-3.4.0/kcontrol/icons/Makefile.in	2005-03-04 19:44:22.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -86,18 +86,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_icons_la_SOURCES) $(testicons_SOURCES)
+ DIST_SOURCES = $(kcm_icons_la_SOURCES) $(testicons_SOURCES)
+@@ -292,6 +292,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@
+@@ -593,7 +596,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*) \
+@@ -631,9 +634,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)
+@@ -943,18 +946,18 @@
+ 
+ 
+ #>+ 3
+-iconthemes.moc: $(srcdir)/iconthemes.h
+-	$(MOC) $(srcdir)/iconthemes.h -o iconthemes.moc
++icons.moc: $(srcdir)/icons.h
++	$(MOC) $(srcdir)/icons.h -o icons.moc
+ 
+ #>+ 2
+-mocs: iconthemes.moc
++mocs: icons.moc
+ 
+ #>+ 3
+-icons.moc: $(srcdir)/icons.h
+-	$(MOC) $(srcdir)/icons.h -o icons.moc
++iconthemes.moc: $(srcdir)/iconthemes.h
++	$(MOC) $(srcdir)/iconthemes.h -o iconthemes.moc
+ 
+ #>+ 2
+-mocs: icons.moc
++mocs: iconthemes.moc
+ 
+ #>+ 3
+ main.moc: $(srcdir)/main.h
+@@ -965,7 +968,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  iconthemes.moc icons.moc main.moc
++	-rm -f  icons.moc iconthemes.moc main.moc
+ 
+ #>+ 2
+ KDE_DIST=icons.desktop Makefile.in uninstall.desktop Makefile.am 
+@@ -1016,7 +1019,7 @@
+ 
+ 
+ #>+ 11
+-kcm_icons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconthemes.cpp $(srcdir)/icons.cpp $(srcdir)/main.cpp  icons.moc iconthemes.moc main.moc
++kcm_icons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconthemes.cpp $(srcdir)/icons.cpp $(srcdir)/main.cpp  iconthemes.moc icons.moc main.moc
+ 	@echo 'creating kcm_icons_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_icons_la.all_cpp.files kcm_icons_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/info/Makefile.in kdebase-3.4.0/kcontrol/info/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/info/Makefile.in	2005-03-04 08:14:50.000000000 -0500
++++ kdebase-3.4.0/kcontrol/info/Makefile.in	2005-03-04 19:44:23.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_info_la_SOURCES)
+ DIST_SOURCES = $(kcm_info_la_SOURCES)
+@@ -287,6 +287,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@
+@@ -588,7 +591,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*) \
+@@ -626,9 +629,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)
+@@ -930,7 +933,7 @@
+ 	-rm -f  memory.moc
+ 
+ #>+ 2
+-KDE_DIST=memory_linux.cpp configure.in.bot info_netbsd.cpp partitions.desktop info_solaris.cpp pci.desktop xserver.desktop info_generic.cpp interrupts.desktop info_linux.cpp memory.desktop info.cpp info_svr4.cpp memory_solaris.cpp ioports.desktop info_openbsd.cpp info_sgi.cpp sound.desktop memory_netbsd.cpp memory_sgi.cpp info_hpux.cpp info_fbsd.cpp info.h memory_tru64.cpp devices.desktop memory_fbsd.cpp configure.in.in opengl.desktop memory_osx.cpp dma.desktop info_osx.cpp Makefile.in processor.desktop memory_hpux.cpp info_aix.cpp scsi.desktop Makefile.am memory.h 
++KDE_DIST=memory_linux.cpp configure.in.bot info_netbsd.cpp partitions.desktop info_solaris.cpp pci.desktop xserver.desktop info_generic.cpp interrupts.desktop info_linux.cpp memory.desktop info.cpp info_svr4.cpp memory_solaris.cpp ioports.desktop info_openbsd.cpp info_sgi.cpp sound.desktop memory_netbsd.cpp memory_sgi.cpp info_hpux.cpp info_fbsd.cpp info.h devices.desktop memory_tru64.cpp memory_fbsd.cpp configure.in.in opengl.desktop dma.desktop memory_osx.cpp info_osx.cpp Makefile.in processor.desktop memory_hpux.cpp info_aix.cpp scsi.desktop Makefile.am memory.h 
+ 
+ #>+ 3
+ clean-closures:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/input/Makefile.in kdebase-3.4.0/kcontrol/input/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/input/Makefile.in	2005-03-04 08:14:50.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/Makefile.in	2005-03-04 19:44:23.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -83,18 +83,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_input_la_SOURCES)
+ DIST_SOURCES = $(kcm_input_la_SOURCES)
+@@ -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@
+@@ -612,7 +615,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*) \
+@@ -650,9 +653,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)
+@@ -769,7 +772,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -781,7 +790,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -789,7 +798,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -810,7 +825,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/input/core/Makefile.in kdebase-3.4.0/kcontrol/input/core/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/input/core/Makefile.in	2005-03-04 08:14:51.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/core/Makefile.in	2005-03-04 19:44:23.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -66,18 +66,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libthemepage_la_SOURCES)
+ DIST_SOURCES = $(libthemepage_la_SOURCES)
+@@ -270,6 +270,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@
+@@ -563,7 +566,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*) \
+@@ -601,9 +604,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/input/pics/Makefile.in kdebase-3.4.0/kcontrol/input/pics/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/input/pics/Makefile.in	2005-03-04 08:14:51.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/pics/Makefile.in	2005-03-04 19:44:24.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/input/xcursor/Makefile.in kdebase-3.4.0/kcontrol/input/xcursor/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/input/xcursor/Makefile.in	2005-03-04 08:14:51.000000000 -0500
++++ kdebase-3.4.0/kcontrol/input/xcursor/Makefile.in	2005-03-04 19:44:24.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -69,18 +69,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libthemepage_la_SOURCES)
+ DIST_SOURCES = $(libthemepage_la_SOURCES)
+@@ -273,6 +273,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@
+@@ -566,7 +569,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*) \
+@@ -604,9 +607,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/ioslaveinfo/Makefile.in kdebase-3.4.0/kcontrol/ioslaveinfo/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/ioslaveinfo/Makefile.in	2005-03-04 08:14:51.000000000 -0500
++++ kdebase-3.4.0/kcontrol/ioslaveinfo/Makefile.in	2005-03-04 19:44:24.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_ioslaveinfo_la_SOURCES)
+ DIST_SOURCES = $(kcm_ioslaveinfo_la_SOURCES)
+@@ -280,6 +280,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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/joystick/Makefile.in kdebase-3.4.0/kcontrol/joystick/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/joystick/Makefile.in	2005-03-04 08:14:52.000000000 -0500
++++ kdebase-3.4.0/kcontrol/joystick/Makefile.in	2005-03-04 19:44:24.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_joystick_la_SOURCES)
+ DIST_SOURCES = $(kcm_joystick_la_SOURCES)
+@@ -288,6 +288,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@
+@@ -588,7 +591,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*) \
+@@ -626,9 +629,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kcontrol/Makefile.in kdebase-3.4.0/kcontrol/kcontrol/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kcontrol/Makefile.in	2005-03-04 08:14:52.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kcontrol/Makefile.in	2005-03-04 19:44:24.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -113,18 +113,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcontrol_la_SOURCES)
+ #>- DIST_SOURCES = $(kcontrol_la_SOURCES)
+@@ -336,6 +336,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@
+@@ -654,7 +657,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*) \
+@@ -692,9 +695,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)
+@@ -892,7 +895,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -904,7 +913,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -912,7 +921,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -933,7 +948,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1304,25 +1319,25 @@
+ mocs: modulemenu.moc
+ 
+ #>+ 3
+-searchwidget.moc: $(srcdir)/searchwidget.h
+-	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
++moduleIface.moc: $(srcdir)/moduleIface.h
++	$(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
+ 
+ #>+ 2
+-mocs: searchwidget.moc
++mocs: moduleIface.moc
+ 
+ #>+ 3
+-moduleIface.moc: $(srcdir)/moduleIface.h
+-	$(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
++searchwidget.moc: $(srcdir)/searchwidget.h
++	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
+ 
+ #>+ 2
+-mocs: moduleIface.moc
++mocs: searchwidget.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-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 searchwidget.moc moduleIface.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
+ 
+ #>+ 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.h modulemenu.cpp kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h indexwidget.h cr128-app-kcontrol.png 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 
+ 
+ #>+ 4
+ clean-idl:
+@@ -1334,23 +1349,23 @@
+ 
+ #>+ 19
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcontrol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1391,7 +1406,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 aboutwidget.moc dockcontainer.moc moduleiconview.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc moduletreeview.moc toplevel.moc moduleIface.moc searchwidget.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
+ 	@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; \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kcontrol/about/Makefile.in kdebase-3.4.0/kcontrol/kcontrol/about/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kcontrol/about/Makefile.in	2005-03-04 08:14:52.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kcontrol/about/Makefile.in	2005-03-04 19:44:24.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -538,7 +541,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*) \
+@@ -576,9 +579,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kded/Makefile.in kdebase-3.4.0/kcontrol/kded/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kded/Makefile.in	2005-03-04 08:14:52.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kded/Makefile.in	2005-03-04 19:44:24.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_kded_la_SOURCES)
+ DIST_SOURCES = $(kcm_kded_la_SOURCES)
+@@ -280,6 +280,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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -917,7 +920,7 @@
+ 	-rm -f  kcmkded.moc
+ 
+ #>+ 2
+-KDE_DIST=kcmkded.desktop Makefile.in kcmkded.h Makefile.am 
++KDE_DIST=kcmkded.desktop kcmkded.h Makefile.in Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kdm/Makefile.in kdebase-3.4.0/kcontrol/kdm/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kdm/Makefile.in	2005-03-04 08:14:52.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kdm/Makefile.in	2005-03-04 19:44:24.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -84,18 +84,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_kdm_la_SOURCES)
+ DIST_SOURCES = $(kcm_kdm_la_SOURCES)
+@@ -289,6 +289,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@
+@@ -591,7 +594,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*) \
+@@ -629,9 +632,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)
+@@ -947,18 +950,18 @@
+ mocs: kdm-conv.moc
+ 
+ #>+ 3
+-kdm-font.moc: $(srcdir)/kdm-font.h
+-	$(MOC) $(srcdir)/kdm-font.h -o kdm-font.moc
++kdm-appear.moc: $(srcdir)/kdm-appear.h
++	$(MOC) $(srcdir)/kdm-appear.h -o kdm-appear.moc
+ 
+ #>+ 2
+-mocs: kdm-font.moc
++mocs: kdm-appear.moc
+ 
+ #>+ 3
+-kdm-appear.moc: $(srcdir)/kdm-appear.h
+-	$(MOC) $(srcdir)/kdm-appear.h -o kdm-appear.moc
++kdm-font.moc: $(srcdir)/kdm-font.h
++	$(MOC) $(srcdir)/kdm-font.h -o kdm-font.moc
+ 
+ #>+ 2
+-mocs: kdm-appear.moc
++mocs: kdm-font.moc
+ 
+ #>+ 3
+ background.moc: $(srcdir)/background.h
+@@ -976,7 +979,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kdm-sess.moc kdm-users.moc kdm-conv.moc kdm-font.moc kdm-appear.moc background.moc main.moc
++	-rm -f  kdm-sess.moc kdm-users.moc kdm-conv.moc kdm-appear.moc kdm-font.moc background.moc main.moc
+ 
+ #>+ 2
+ KDE_DIST=main.h kdm-font.h kdm-users.h kdm-sess.h background.h kdm.desktop kdm-appear.h Makefile.in kdm-conv.h Makefile.am 
+@@ -1027,7 +1030,7 @@
+ 
+ 
+ #>+ 11
+-kcm_kdm_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/background.cpp $(srcdir)/kdm-appear.cpp $(srcdir)/kdm-font.cpp $(srcdir)/kdm-sess.cpp $(srcdir)/kdm-users.cpp $(srcdir)/kdm-conv.cpp $(srcdir)/main.cpp  kdm-sess.moc kdm-users.moc kdm-conv.moc kdm-appear.moc kdm-font.moc background.moc main.moc
++kcm_kdm_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/background.cpp $(srcdir)/kdm-appear.cpp $(srcdir)/kdm-font.cpp $(srcdir)/kdm-sess.cpp $(srcdir)/kdm-users.cpp $(srcdir)/kdm-conv.cpp $(srcdir)/main.cpp  kdm-sess.moc kdm-users.moc kdm-conv.moc kdm-font.moc kdm-appear.moc background.moc main.moc
+ 	@echo 'creating kcm_kdm_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_kdm_la.all_cpp.files kcm_kdm_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_kdm_la.all_cpp.final; \
+@@ -1069,8 +1072,8 @@
+ #>+ 17
+ kdm-conv.o: kdm-conv.moc 
+ main.lo: main.moc 
+-kdm-appear.lo: kdm-appear.moc 
+ kdm-font.lo: kdm-font.moc 
++kdm-appear.lo: kdm-appear.moc 
+ main.o: main.moc 
+ kdm-appear.o: kdm-appear.moc 
+ kdm-sess.lo: kdm-sess.moc 
+diff -Nrua kdebase-3.4.0.orig/kcontrol/keys/Makefile.in kdebase-3.4.0/kcontrol/keys/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/keys/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/keys/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -84,18 +84,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_keys_la_SOURCES)
+ DIST_SOURCES = $(kcm_keys_la_SOURCES)
+@@ -291,6 +291,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@
+@@ -593,7 +596,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*) \
+@@ -631,9 +634,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kfontinst/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -263,6 +263,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@
+@@ -556,7 +559,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*) \
+@@ -594,9 +597,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:
+@@ -633,7 +636,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -645,7 +654,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -653,7 +662,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -674,7 +689,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kcmfontinst/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kcmfontinst/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -84,18 +84,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_fontinst_la_SOURCES)
+ DIST_SOURCES = $(kcm_fontinst_la_SOURCES)
+@@ -290,6 +290,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@
+@@ -599,7 +602,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*) \
+@@ -637,9 +640,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)
+@@ -959,17 +962,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kfile-plugin/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kfile-plugin/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kfile_font_la_SOURCES)
+ DIST_SOURCES = $(kfile_font_la_SOURCES)
+@@ -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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kfontinst/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kfontinst/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kfontinst/kfontinst/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kfontinst/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,29 +77,29 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kfontinst_SOURCES)
+ DIST_SOURCES = $(kfontinst_SOURCES)
+@@ -292,6 +292,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@
+@@ -599,7 +602,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -637,9 +640,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/kio/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/kio/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kfontinst/kio/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/kio/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_fonts_la_SOURCES)
+ DIST_SOURCES = $(kio_fonts_la_SOURCES)
+@@ -288,6 +288,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@
+@@ -596,7 +599,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*) \
+@@ -634,9 +637,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/lib/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/lib/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kfontinst/lib/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/lib/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkfontinst_la_SOURCES)
+ DIST_SOURCES = $(libkfontinst_la_SOURCES)
+@@ -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@
+@@ -587,7 +590,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*) \
+@@ -625,9 +628,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/thumbnail/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/thumbnail/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kfontinst/thumbnail/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/thumbnail/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(fontthumbnail_la_SOURCES)
+ DIST_SOURCES = $(fontthumbnail_la_SOURCES)
+@@ -285,6 +285,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@
+@@ -582,7 +585,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*) \
+@@ -620,9 +623,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kfontinst/viewpart/Makefile.in kdebase-3.4.0/kcontrol/kfontinst/viewpart/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kfontinst/viewpart/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kfontinst/viewpart/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -93,18 +93,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkfontviewpart_la_SOURCES) $(kfontview_SOURCES)
+ DIST_SOURCES = $(libkfontviewpart_la_SOURCES) $(kfontview_SOURCES)
+@@ -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@
+@@ -603,7 +606,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*) \
+@@ -641,9 +644,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kicker/Makefile.in kdebase-3.4.0/kcontrol/kicker/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kicker/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kicker/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -85,18 +85,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_kicker_la_SOURCES)
+ DIST_SOURCES = $(kcm_kicker_la_SOURCES)
+@@ -292,6 +292,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@
+@@ -604,7 +607,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*) \
+@@ -642,9 +645,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)
+@@ -977,18 +980,18 @@
+ 
+ 
+ #>+ 3
+-menutab_impl.moc: $(srcdir)/menutab_impl.h
+-	$(MOC) $(srcdir)/menutab_impl.h -o menutab_impl.moc
++applettab_impl.moc: $(srcdir)/applettab_impl.h
++	$(MOC) $(srcdir)/applettab_impl.h -o applettab_impl.moc
+ 
+ #>+ 2
+-mocs: menutab_impl.moc
++mocs: applettab_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
+ 
+ #>+ 2
+-mocs: applettab_impl.moc
++mocs: menutab_impl.moc
+ 
+ #>+ 3
+ lookandfeeltab_kcm.moc: $(srcdir)/lookandfeeltab_kcm.h
+@@ -1034,7 +1037,7 @@
+ 
+ #>+ 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
+ 
+ #>+ 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 uninstall.desktop lookandfeeltab_kcm.cpp Makefile.am 
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kio/Makefile.in kdebase-3.4.0/kcontrol/kio/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kio/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kio/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -89,18 +89,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_kio_la_SOURCES)
+ DIST_SOURCES = $(kcm_kio_la_SOURCES)
+@@ -312,6 +312,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@
+@@ -634,7 +637,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*) \
+@@ -672,9 +675,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)
+@@ -839,7 +842,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -851,7 +860,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -859,7 +868,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -880,7 +895,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1148,18 +1163,18 @@
+ mocs: smbrodlg.moc
+ 
+ #>+ 3
+-socks.moc: $(srcdir)/socks.h
+-	$(MOC) $(srcdir)/socks.h -o socks.moc
++kmanualproxydlg.moc: $(srcdir)/kmanualproxydlg.h
++	$(MOC) $(srcdir)/kmanualproxydlg.h -o kmanualproxydlg.moc
+ 
+ #>+ 2
+-mocs: socks.moc
++mocs: kmanualproxydlg.moc
+ 
+ #>+ 3
+-kmanualproxydlg.moc: $(srcdir)/kmanualproxydlg.h
+-	$(MOC) $(srcdir)/kmanualproxydlg.h -o kmanualproxydlg.moc
++socks.moc: $(srcdir)/socks.h
++	$(MOC) $(srcdir)/socks.h -o socks.moc
+ 
+ #>+ 2
+-mocs: kmanualproxydlg.moc
++mocs: socks.moc
+ 
+ #>+ 3
+ kproxydlg.moc: $(srcdir)/kproxydlg.h
+@@ -1190,18 +1205,18 @@
+ mocs: kcookiesmain.moc
+ 
+ #>+ 3
+-kcookiesmanagement.moc: $(srcdir)/kcookiesmanagement.h
+-	$(MOC) $(srcdir)/kcookiesmanagement.h -o kcookiesmanagement.moc
++kcookiespolicies.moc: $(srcdir)/kcookiespolicies.h
++	$(MOC) $(srcdir)/kcookiespolicies.h -o kcookiespolicies.moc
+ 
+ #>+ 2
+-mocs: kcookiesmanagement.moc
++mocs: kcookiespolicies.moc
+ 
+ #>+ 3
+-kcookiespolicies.moc: $(srcdir)/kcookiespolicies.h
+-	$(MOC) $(srcdir)/kcookiespolicies.h -o kcookiespolicies.moc
++kcookiesmanagement.moc: $(srcdir)/kcookiesmanagement.h
++	$(MOC) $(srcdir)/kcookiesmanagement.h -o kcookiesmanagement.moc
+ 
+ #>+ 2
+-mocs: kcookiespolicies.moc
++mocs: kcookiesmanagement.moc
+ 
+ #>+ 3
+ netpref.moc: $(srcdir)/netpref.h
+@@ -1233,10 +1248,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  uagentproviderdlg.moc smbrodlg.moc socks.moc kmanualproxydlg.moc kproxydlg.moc useragentdlg.moc main.moc kcookiesmain.moc kcookiesmanagement.moc kcookiespolicies.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
++	-rm -f  uagentproviderdlg.moc smbrodlg.moc kmanualproxydlg.moc socks.moc kproxydlg.moc useragentdlg.moc main.moc kcookiesmain.moc kcookiespolicies.moc kcookiesmanagement.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
+ 
+ #>+ 2
+-KDE_DIST=uasprovider.desktop policydlg.h fakeuaprovider.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO useragentdlg.h kioslave.kcfg kio_ftprc.kcfg socksbase.ui netpref.h smbrodlg.h main.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui useragentdlg_ui.ui cache_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop uagentproviderdlg.h kproxydlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h kcookiesmain.h Makefile.am manualproxy_ui.ui kmanualproxydlg.h 
++KDE_DIST=uasprovider.desktop fakeuaprovider.h policydlg.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO kioslave.kcfg useragentdlg.h kio_ftprc.kcfg socksbase.ui netpref.h main.h smbrodlg.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui useragentdlg_ui.ui cache_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop uagentproviderdlg.h kproxydlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h Makefile.am kcookiesmain.h kmanualproxydlg.h manualproxy_ui.ui 
+ 
+ #>+ 13
+ clean-ui:
+@@ -1298,7 +1313,7 @@
+ 
+ 
+ #>+ 11
+-kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp  uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc socks.moc kmanualproxydlg.moc useragentdlg.moc main.moc kcookiespolicies.moc kcookiesmanagement.moc cache.moc
++kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp  uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc kmanualproxydlg.moc socks.moc useragentdlg.moc main.moc kcookiesmanagement.moc kcookiespolicies.moc cache.moc
+ 	@echo 'creating kcm_kio_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_kio_la.all_cpp.files kcm_kio_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_kio_la.all_cpp.final; \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kio/uasproviders/Makefile.in kdebase-3.4.0/kcontrol/kio/uasproviders/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kio/uasproviders/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kio/uasproviders/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -543,7 +546,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*) \
+@@ -581,9 +584,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:
+@@ -743,7 +746,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=ns71oncurrent.desktop mozoncurrent.desktop mozoncurrent16.desktop nn476onppc.desktop op403onwinnt4.desktop w3moncurrent.desktop nn475onwin95.desktop ie60onwinnt51.desktop ie55onwin98.desktop googlebot.desktop safari.desktop ie45onwinnt5.desktop wgetoncurrent.desktop firefoxoncurrent.desktop nn475oncurrent.desktop lynxoncurrent.desktop ie501onwinnt5.desktop ns71onwinnt51.desktop ie60oncurrent.desktop ie55onwinnt5.desktop Makefile.in mozonwin2000.desktop ie401onwinnt4.desktop ie50onppc.desktop op75oncurrent.desktop mozonwinxp.desktop nn301oncurrent.desktop mozoncurrent12.desktop Makefile.am 
++KDE_DIST=ns71oncurrent.desktop mozoncurrent.desktop mozoncurrent16.desktop nn476onppc.desktop op403onwinnt4.desktop w3moncurrent.desktop nn475onwin95.desktop ie60onwinnt51.desktop ie55onwin98.desktop googlebot.desktop safari.desktop ie45onwinnt5.desktop wgetoncurrent.desktop firefoxoncurrent.desktop nn475oncurrent.desktop lynxoncurrent.desktop ie501onwinnt5.desktop ns71onwinnt51.desktop ie55onwinnt5.desktop ie60oncurrent.desktop Makefile.in mozonwin2000.desktop ie401onwinnt4.desktop ie50onppc.desktop op75oncurrent.desktop mozonwinxp.desktop nn301oncurrent.desktop mozoncurrent12.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/knotify/Makefile.in kdebase-3.4.0/kcontrol/knotify/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/knotify/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/knotify/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_knotify_la_SOURCES)
+ DIST_SOURCES = $(kcm_knotify_la_SOURCES)
+@@ -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@
+@@ -604,7 +607,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*) \
+@@ -642,9 +645,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)
+@@ -759,7 +762,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -771,7 +780,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -779,7 +788,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -800,7 +815,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/knotify/sounds/Makefile.in kdebase-3.4.0/kcontrol/knotify/sounds/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/knotify/sounds/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/knotify/sounds/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -644,7 +647,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*) \
+@@ -682,9 +685,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:
+@@ -844,7 +847,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=KDE_Beep_Pop.wav KDE_Beep_RimShot.wav KDE_Window_Shade_Up.wav KDE_Beep_Beep.wav KDE_Desktop3.wav KDE_Window_UnSticky.wav KDE_Beep_Door.wav KDE_Window_Maximize.wav KDE_Beep_ClassicBeep.wav KDE_Beep_Ahem.wav KDE_Beep_Bottles.wav KDE_Window_Open.wav KDE_Dialog_Disappear.wav KDE_Beep_ShortBeep.wav KDE_Error.wav KDE_Window_DeIconify.wav KDE_Critical_Error.wav KDE_Window_Iconify.wav KDE_Beep_Yo.wav KDE_Window_Sticky.wav KDE_Notify.wav KDE_Window_Close.wav KDE_Desktop2.wav KDE_Desktop1.wav KDE_Beep_Lightning.wav KDE_Desktop6.wav KDE_Window_UnMaximize.wav KDE_Desktop4.wav KDE_Desktop5.wav KDE_Beep_Connect.wav Makefile.in KDE_Beep_ClockChime.wav KDE_Window_Shade_Down.wav KDE_Beep_Honk.wav KDE_Click.wav KDE_Logout.wav KDE_Close_Window.wav KDE_Dialog_Appear.wav Makefile.am KDE_Startup.wav KDE_Beep_RingRing.wav KDE_Desktop7.wav KDE_Desktop8.wav 
++KDE_DIST=KDE_Beep_Pop.wav KDE_Beep_RimShot.wav KDE_Window_Shade_Up.wav KDE_Beep_Beep.wav KDE_Desktop3.wav KDE_Beep_Door.wav KDE_Window_UnSticky.wav KDE_Window_Maximize.wav KDE_Beep_ClassicBeep.wav KDE_Beep_Ahem.wav KDE_Beep_Bottles.wav KDE_Window_Open.wav KDE_Dialog_Disappear.wav KDE_Beep_ShortBeep.wav KDE_Error.wav KDE_Window_DeIconify.wav KDE_Critical_Error.wav KDE_Window_Iconify.wav KDE_Beep_Yo.wav KDE_Window_Sticky.wav KDE_Notify.wav KDE_Desktop2.wav KDE_Window_Close.wav KDE_Desktop1.wav KDE_Beep_Lightning.wav KDE_Desktop6.wav KDE_Desktop4.wav KDE_Window_UnMaximize.wav KDE_Desktop5.wav KDE_Beep_Connect.wav Makefile.in KDE_Beep_ClockChime.wav KDE_Window_Shade_Down.wav KDE_Beep_Honk.wav KDE_Click.wav KDE_Logout.wav KDE_Close_Window.wav KDE_Dialog_Appear.wav Makefile.am KDE_Startup.wav KDE_Beep_RingRing.wav KDE_Desktop7.wav KDE_Desktop8.wav 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/konq/Makefile.in kdebase-3.4.0/kcontrol/konq/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/konq/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/konq/Makefile.in	2005-03-04 19:44:25.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -84,18 +84,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_konq_la_SOURCES)
+ DIST_SOURCES = $(kcm_konq_la_SOURCES)
+@@ -291,6 +291,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@
+@@ -604,7 +607,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*) \
+@@ -642,9 +645,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)
+@@ -1013,18 +1016,18 @@
+ mocs: desktopbehavior_impl.moc
+ 
+ #>+ 3
+-desktop.moc: $(srcdir)/desktop.h
+-	$(MOC) $(srcdir)/desktop.h -o desktop.moc
++browser.moc: $(srcdir)/browser.h
++	$(MOC) $(srcdir)/browser.h -o browser.moc
+ 
+ #>+ 2
+-mocs: desktop.moc
++mocs: browser.moc
+ 
+ #>+ 3
+-browser.moc: $(srcdir)/browser.h
+-	$(MOC) $(srcdir)/browser.h -o browser.moc
++desktop.moc: $(srcdir)/desktop.h
++	$(MOC) $(srcdir)/desktop.h -o desktop.moc
+ 
+ #>+ 2
+-mocs: browser.moc
++mocs: desktop.moc
+ 
+ #>+ 3
+ rootopts.moc: $(srcdir)/rootopts.h
+@@ -1035,10 +1038,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc desktop.moc browser.moc rootopts.moc
++	-rm -f  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
+ 
+ #>+ 2
+-KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h filepreviews.desktop desktop.h previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop desktop.desktop Makefile.am 
++KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h desktop.h filepreviews.desktop previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop desktop.desktop Makefile.am 
+ 
+ #>+ 4
+ clean-idl:
+@@ -1096,7 +1099,7 @@
+ 
+ 
+ #>+ 11
+-kcm_konq_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/behaviour.cpp $(srcdir)/desktop.cpp $(srcdir)/rootopts.cpp $(srcdir)/fontopts.cpp $(srcdir)/previews.cpp $(srcdir)/browser.cpp $(srcdir)/main.cpp $(srcdir)/desktopbehavior_impl.cpp uiserver_stub.cpp desktopbehavior.cpp  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc desktopbehavior.moc rootopts.moc
++kcm_konq_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/behaviour.cpp $(srcdir)/desktop.cpp $(srcdir)/rootopts.cpp $(srcdir)/fontopts.cpp $(srcdir)/previews.cpp $(srcdir)/browser.cpp $(srcdir)/main.cpp $(srcdir)/desktopbehavior_impl.cpp uiserver_stub.cpp desktopbehavior.cpp  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc desktop.moc browser.moc desktopbehavior.moc rootopts.moc
+ 	@echo 'creating kcm_konq_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_konq_la.all_cpp.files kcm_konq_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_konq_la.all_cpp.final; \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/konqhtml/Makefile.in kdebase-3.4.0/kcontrol/konqhtml/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/konqhtml/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/konqhtml/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -83,18 +83,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_konqhtml_la_SOURCES)
+ DIST_SOURCES = $(kcm_konqhtml_la_SOURCES)
+@@ -288,6 +288,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@
+@@ -597,7 +600,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*) \
+@@ -635,9 +638,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)
+@@ -1007,22 +1010,22 @@
+ mocs: advancedTabDialog.moc
+ 
+ #>+ 3
+-pluginopts.moc: $(srcdir)/pluginopts.h
+-	$(MOC) $(srcdir)/pluginopts.h -o pluginopts.moc
++htmlopts.moc: $(srcdir)/htmlopts.h
++	$(MOC) $(srcdir)/htmlopts.h -o htmlopts.moc
+ 
+ #>+ 2
+-mocs: pluginopts.moc
++mocs: htmlopts.moc
+ 
+ #>+ 3
+-htmlopts.moc: $(srcdir)/htmlopts.h
+-	$(MOC) $(srcdir)/htmlopts.h -o htmlopts.moc
++pluginopts.moc: $(srcdir)/pluginopts.h
++	$(MOC) $(srcdir)/pluginopts.h -o pluginopts.moc
+ 
+ #>+ 2
+-mocs: htmlopts.moc
++mocs: pluginopts.moc
+ 
+ #>+ 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
+ 
+ #>+ 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 khttpoptdlg.h javaopts.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am 
+@@ -1079,7 +1082,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
+ 	@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; \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/konsole/Makefile.in kdebase-3.4.0/kcontrol/konsole/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/konsole/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/konsole/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_konsole_la_SOURCES)
+ DIST_SOURCES = $(kcm_konsole_la_SOURCES)
+@@ -288,6 +288,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@
+@@ -592,7 +595,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*) \
+@@ -630,9 +633,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/Makefile.in kdebase-3.4.0/kcontrol/krdb/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -66,18 +66,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkrdb_la_SOURCES)
+ DIST_SOURCES = $(libkrdb_la_SOURCES)
+@@ -292,6 +292,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@
+@@ -590,7 +593,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*) \
+@@ -628,9 +631,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:
+@@ -710,7 +713,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -722,7 +731,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -730,7 +739,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -751,7 +766,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/ad/Makefile.in kdebase-3.4.0/kcontrol/krdb/ad/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/ad/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/ad/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -249,6 +249,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)
+@@ -765,7 +768,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad krdb Xdvi.ad AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad Makefile.in XOsview.ad WPerfect.ad Editres.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am 
++KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad Xdvi.ad krdb AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad XOsview.ad Makefile.in WPerfect.ad Editres.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/kcs/Makefile.in kdebase-3.4.0/kcontrol/krdb/kcs/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/kcs/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/kcs/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -542,7 +545,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*) \
+@@ -580,9 +583,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:
+@@ -744,7 +747,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc Pumpkin.kcsrc MediaPeach.kcsrc DarkBlue.kcsrc KDEOne.kcsrc DesertRed.kcsrc Keramik.kcsrc WindowsXP.kcsrc BlackOnWhite.kcsrc BeOS.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc YellowOnBlue.kcsrc Windows95.kcsrc CDE.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am 
++KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc MediaPeach.kcsrc Pumpkin.kcsrc DarkBlue.kcsrc DesertRed.kcsrc KDEOne.kcsrc Keramik.kcsrc WindowsXP.kcsrc BlackOnWhite.kcsrc BeOS.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc CDE.kcsrc Windows95.kcsrc YellowOnBlue.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/pics/Makefile.in kdebase-3.4.0/kcontrol/krdb/pics/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/pics/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/pics/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in	2005-03-04 08:14:53.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/KDE_Classic/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/KDE_Classic/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Keramik/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Keramik/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Keramik/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Keramik/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -543,7 +546,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*) \
+@@ -581,9 +584,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:
+@@ -603,7 +606,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -615,7 +624,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -623,7 +632,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -644,7 +659,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Plastik/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Plastik/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Plastik/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Plastik/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Platinum/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Platinum/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Platinum/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Platinum/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Redmond/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Redmond/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Redmond/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Redmond/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/Sunshine/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/Sunshine/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/Sunshine/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/Sunshine/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in	2005-03-04 19:44:26.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/kthememanager/Makefile.in kdebase-3.4.0/kcontrol/kthememanager/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/kthememanager/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/kthememanager/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -85,18 +85,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_kthememanager_la_SOURCES)
+ DIST_SOURCES = $(kcm_kthememanager_la_SOURCES)
+@@ -292,6 +292,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@
+@@ -595,7 +598,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*) \
+@@ -633,9 +636,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/launch/Makefile.in kdebase-3.4.0/kcontrol/launch/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/launch/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/launch/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_launch_la_SOURCES)
+ DIST_SOURCES = $(kcm_launch_la_SOURCES)
+@@ -283,6 +283,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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/locale/Makefile.in kdebase-3.4.0/kcontrol/locale/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/locale/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/locale/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -86,18 +86,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_locale_la_SOURCES)
+ DIST_SOURCES = $(kcm_locale_la_SOURCES)
+@@ -306,6 +306,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@
+@@ -605,7 +608,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*) \
+@@ -643,9 +646,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)
+@@ -750,7 +753,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -762,7 +771,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -770,7 +779,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -791,7 +806,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1059,18 +1074,18 @@
+ mocs: toplevel.moc
+ 
+ #>+ 3
+-localeother.moc: $(srcdir)/localeother.h
+-	$(MOC) $(srcdir)/localeother.h -o localeother.moc
++localemon.moc: $(srcdir)/localemon.h
++	$(MOC) $(srcdir)/localemon.h -o localemon.moc
+ 
+ #>+ 2
+-mocs: localeother.moc
++mocs: localemon.moc
+ 
+ #>+ 3
+-localemon.moc: $(srcdir)/localemon.h
+-	$(MOC) $(srcdir)/localemon.h -o localemon.moc
++localeother.moc: $(srcdir)/localeother.h
++	$(MOC) $(srcdir)/localeother.h -o localeother.moc
+ 
+ #>+ 2
+-mocs: localemon.moc
++mocs: localeother.moc
+ 
+ #>+ 3
+ kcmlocale.moc: $(srcdir)/kcmlocale.h
+@@ -1088,7 +1103,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  localetime.moc klocalesample.moc toplevel.moc localeother.moc localemon.moc kcmlocale.moc localenum.moc
++	-rm -f  localetime.moc klocalesample.moc toplevel.moc localemon.moc localeother.moc kcmlocale.moc localenum.moc
+ 
+ #>+ 2
+ KDE_DIST=TIMEZONES language.desktop Makefile.in Makefile.am 
+@@ -1139,7 +1154,7 @@
+ 
+ 
+ #>+ 11
+-kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp  localetime.moc klocalesample.moc localemon.moc localeother.moc toplevel.moc kcmlocale.moc localenum.moc
++kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp  localetime.moc klocalesample.moc localeother.moc localemon.moc toplevel.moc kcmlocale.moc localenum.moc
+ 	@echo 'creating kcm_locale_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_locale_la.all_cpp.files kcm_locale_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_locale_la.all_cpp.final; \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/locale/default/Makefile.in kdebase-3.4.0/kcontrol/locale/default/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/locale/default/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/locale/default/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/locale/pics/Makefile.in kdebase-3.4.0/kcontrol/locale/pics/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/locale/pics/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/locale/pics/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/nics/Makefile.in kdebase-3.4.0/kcontrol/nics/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/nics/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/nics/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_nic_la_SOURCES)
+ DIST_SOURCES = $(kcm_nic_la_SOURCES)
+@@ -280,6 +280,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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/performance/Makefile.in kdebase-3.4.0/kcontrol/performance/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/performance/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/performance/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_performance_la_SOURCES)
+ DIST_SOURCES = $(kcm_performance_la_SOURCES)
+@@ -289,6 +289,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@
+@@ -592,7 +595,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*) \
+@@ -630,9 +633,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)
+@@ -944,18 +947,18 @@
+ 
+ 
+ #>+ 3
+-system.moc: $(srcdir)/system.h
+-	$(MOC) $(srcdir)/system.h -o system.moc
++konqueror.moc: $(srcdir)/konqueror.h
++	$(MOC) $(srcdir)/konqueror.h -o konqueror.moc
+ 
+ #>+ 2
+-mocs: system.moc
++mocs: konqueror.moc
+ 
+ #>+ 3
+-konqueror.moc: $(srcdir)/konqueror.h
+-	$(MOC) $(srcdir)/konqueror.h -o konqueror.moc
++system.moc: $(srcdir)/system.h
++	$(MOC) $(srcdir)/system.h -o system.moc
+ 
+ #>+ 2
+-mocs: konqueror.moc
++mocs: system.moc
+ 
+ #>+ 3
+ kcmperformance.moc: $(srcdir)/kcmperformance.h
+@@ -966,7 +969,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  system.moc konqueror.moc kcmperformance.moc
++	-rm -f  konqueror.moc system.moc kcmperformance.moc
+ 
+ #>+ 2
+ KDE_DIST=kcmperformance.h kcmperformance.desktop konqueror_ui.ui system_ui.ui Makefile.in kcmkonqyperformance.desktop Makefile.am 
+@@ -1023,7 +1026,7 @@
+ 
+ 
+ #>+ 11
+-kcm_performance_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmperformance.cpp $(srcdir)/konqueror.cpp $(srcdir)/system.cpp konqueror_ui.cpp system_ui.cpp  system_ui.moc konqueror.moc system.moc kcmperformance.moc konqueror_ui.moc
++kcm_performance_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmperformance.cpp $(srcdir)/konqueror.cpp $(srcdir)/system.cpp konqueror_ui.cpp system_ui.cpp  system_ui.moc system.moc konqueror.moc kcmperformance.moc konqueror_ui.moc
+ 	@echo 'creating kcm_performance_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_performance_la.all_cpp.files kcm_performance_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_performance_la.all_cpp.final; \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/pics/Makefile.in kdebase-3.4.0/kcontrol/pics/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/pics/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/pics/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -523,7 +526,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*) \
+@@ -561,9 +564,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:
+@@ -706,548 +709,548 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-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 cr32-app-background.png cr16-app-kcmmemory.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 cr48-app-date.png cr48-app-bell.png cr32-app-style.png cr48-app-kcmdf.png cr64-app-filetypes.png cr48-app-kcmpci.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 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 cr48-app-energy_star.png cr64-app-energy.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 crsc-app-filetypes.svgz cr128-app-kcmkwm.png 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 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 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 cr64-app-kcmmemory.png cr32-app-kcmprocessor.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 cr48-app-cookie.png cr48-app-access.png cr32-app-kcmkwm.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 cr22-app-kdmconfig.png cr16-app-date.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 cr64-app-stylesheet.png cr48-app-kcmdrkonqi.png cr22-app-kcmkicker.png cr64-app-energy_star.png cr16-app-hwinfo.png cr16-app-proxy.png cr22-app-kthememgr.png cr64-app-background.png cr22-app-background.png cr32-app-kcmpartitions.png cr22-app-date.png cr128-app-kcmmemory.png cr16-app-bell.png cr32-app-arts.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 cr32-app-kcmkicker.png crsc-app-kcmkwm.svgz 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 cr16-app-multimedia.png cr32-app-help_index.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 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-background.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 cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-fonts.png cr22-app-colors.png cr16-app-kcmdevices.png cr16-app-filetypes.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 
+ 
+ #>+ 2
+ docs-am:
+ 
+ #>+ 537
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.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-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
++	$(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-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
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.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)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.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-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.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)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.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)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.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)/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)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
++	$(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)/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)/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)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.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)/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-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.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)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.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)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.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)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.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)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
++	$(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
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.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)/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)/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)/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
++	$(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
++	$(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)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
++	$(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)/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)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.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)/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
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
++	$(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)/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
++	$(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
++	$(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)/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)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.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)/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
++	$(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.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/16x16/apps/proxy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.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/32x32/apps/colors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.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/32x32/apps/kcmdrkonqi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.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/32x32/apps/kcmprocessor.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.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/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/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/32x32/apps/locale.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.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/48x48/apps/cookie.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.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/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/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/enhanced_browsing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.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/48x48/apps/help_index.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.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/kcmdf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
++	-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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
++	-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/32x32/apps/cookie.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
++	-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/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/64x64/apps/looknfeel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.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/64x64/apps/proxy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.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/128x128/apps/kthememgr.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
++	-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/64x64/apps/hwinfo.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.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/scalable/apps/date.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.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/scalable/apps/stylesheet.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
++	-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/128x128/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
++	-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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
++	-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/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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
++	-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/48x48/apps/stylesheet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/kcontrol/privacy/Makefile.in kdebase-3.4.0/kcontrol/privacy/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/privacy/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/privacy/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_privacy_la_SOURCES)
+ DIST_SOURCES = $(kcm_privacy_la_SOURCES)
+@@ -286,6 +286,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/randr/Makefile.in kdebase-3.4.0/kcontrol/randr/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/randr/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/randr/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -121,18 +121,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_randr_la_SOURCES) $(krandrinithack_la_SOURCES) \
+ 	$(librandrinternal_la_SOURCES) $(krandrtray_SOURCES)
+@@ -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@
+@@ -651,7 +654,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*) \
+@@ -689,9 +692,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/samba/Makefile.in kdebase-3.4.0/kcontrol/samba/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/samba/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/samba/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_samba_la_SOURCES)
+ DIST_SOURCES = $(kcm_samba_la_SOURCES)
+@@ -285,6 +285,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@
+@@ -582,7 +585,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*) \
+@@ -620,9 +623,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/screensaver/Makefile.in kdebase-3.4.0/kcontrol/screensaver/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/screensaver/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/screensaver/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -84,18 +84,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_screensaver_la_SOURCES)
+ DIST_SOURCES = $(kcm_screensaver_la_SOURCES)
+@@ -290,6 +290,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@
+@@ -590,7 +593,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*) \
+@@ -628,9 +631,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/smartcard/Makefile.in kdebase-3.4.0/kcontrol/smartcard/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/smartcard/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/smartcard/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_smartcard_la_SOURCES)
+ DIST_SOURCES = $(kcm_smartcard_la_SOURCES)
+@@ -286,6 +286,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/smserver/Makefile.in kdebase-3.4.0/kcontrol/smserver/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/smserver/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/smserver/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_smserver_la_SOURCES)
+ DIST_SOURCES = $(kcm_smserver_la_SOURCES)
+@@ -285,6 +285,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/spellchecking/Makefile.in kdebase-3.4.0/kcontrol/spellchecking/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/spellchecking/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/spellchecking/Makefile.in	2005-03-04 19:44:27.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -74,18 +74,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_spellchecking_la_SOURCES)
+ DIST_SOURCES = $(kcm_spellchecking_la_SOURCES)
+@@ -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@
+@@ -576,7 +579,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*) \
+@@ -614,9 +617,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/style/Makefile.in kdebase-3.4.0/kcontrol/style/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/style/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/style/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_style_la_SOURCES)
+ DIST_SOURCES = $(kcm_style_la_SOURCES)
+@@ -302,6 +302,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@
+@@ -603,7 +606,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*) \
+@@ -641,9 +644,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)
+@@ -743,7 +746,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -755,7 +764,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -763,7 +772,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -784,7 +799,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kcontrol/style/keramik/Makefile.in kdebase-3.4.0/kcontrol/style/keramik/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/style/keramik/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/style/keramik/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kstyle_keramik_config_la_SOURCES)
+ DIST_SOURCES = $(kstyle_keramik_config_la_SOURCES)
+@@ -280,6 +280,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@
+@@ -575,7 +578,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*) \
+@@ -613,9 +616,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/taskbar/Makefile.in kdebase-3.4.0/kcontrol/taskbar/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/taskbar/Makefile.in	2005-03-04 08:14:54.000000000 -0500
++++ kdebase-3.4.0/kcontrol/taskbar/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_taskbar_la_SOURCES)
+ DIST_SOURCES = $(kcm_taskbar_la_SOURCES)
+@@ -285,6 +285,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@
+@@ -585,7 +588,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*) \
+@@ -623,9 +626,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/usbview/Makefile.in kdebase-3.4.0/kcontrol/usbview/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/usbview/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kcontrol/usbview/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_usb_la_SOURCES)
+ DIST_SOURCES = $(kcm_usb_la_SOURCES)
+@@ -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@
+@@ -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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/view1394/Makefile.in kdebase-3.4.0/kcontrol/view1394/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/view1394/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kcontrol/view1394/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_view1394_la_SOURCES)
+ DIST_SOURCES = $(kcm_view1394_la_SOURCES)
+@@ -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@
+@@ -585,7 +588,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*) \
+@@ -623,9 +626,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)
+diff -Nrua kdebase-3.4.0.orig/kcontrol/xinerama/Makefile.in kdebase-3.4.0/kcontrol/xinerama/Makefile.in
+--- kdebase-3.4.0.orig/kcontrol/xinerama/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kcontrol/xinerama/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_xinerama_la_SOURCES)
+ DIST_SOURCES = $(kcm_xinerama_la_SOURCES)
+@@ -285,6 +285,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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)
+diff -Nrua kdebase-3.4.0.orig/kdcop/Makefile.in kdebase-3.4.0/kdcop/Makefile.in
+--- kdebase-3.4.0.orig/kdcop/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdcop/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdcop_SOURCES)
+ DIST_SOURCES = $(kdcop_SOURCES)
+@@ -294,6 +294,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@
+@@ -591,7 +594,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*) \
+@@ -629,9 +632,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kdebugdialog/Makefile.in kdebase-3.4.0/kdebugdialog/Makefile.in
+--- kdebase-3.4.0.orig/kdebugdialog/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdebugdialog/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdebugdialog_SOURCES)
+ DIST_SOURCES = $(kdebugdialog_SOURCES)
+@@ -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@
+@@ -571,7 +574,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*) \
+@@ -609,9 +612,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kdepasswd/Makefile.in kdebase-3.4.0/kdepasswd/Makefile.in
+--- kdebase-3.4.0.orig/kdepasswd/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdepasswd/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdepasswd_SOURCES)
+ DIST_SOURCES = $(kdepasswd_SOURCES)
+@@ -302,6 +302,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@
+@@ -598,7 +601,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*) \
+@@ -636,9 +639,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -737,7 +740,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -749,7 +758,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -757,7 +766,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -778,7 +793,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kdepasswd/kcm/Makefile.in kdebase-3.4.0/kdepasswd/kcm/Makefile.in
+--- kdebase-3.4.0.orig/kdepasswd/kcm/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdepasswd/kcm/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_useraccount_la_SOURCES)
+ DIST_SOURCES = $(kcm_useraccount_la_SOURCES)
+@@ -300,6 +300,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@
+@@ -605,7 +608,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*) \
+@@ -643,9 +646,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)
+@@ -762,7 +765,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -774,7 +783,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -782,7 +791,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -803,7 +818,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kdepasswd/kcm/pics/Makefile.in kdebase-3.4.0/kdepasswd/kcm/pics/Makefile.in
+--- kdebase-3.4.0.orig/kdepasswd/kcm/pics/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdepasswd/kcm/pics/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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:
+diff -Nrua kdebase-3.4.0.orig/kdeprint/Makefile.in kdebase-3.4.0/kdeprint/Makefile.in
+--- kdebase-3.4.0.orig/kdeprint/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdeprint/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+@@ -599,7 +602,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -611,7 +620,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -619,7 +628,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -640,7 +655,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kdeprint/descriptions/Makefile.in kdebase-3.4.0/kdeprint/descriptions/Makefile.in
+--- kdebase-3.4.0.orig/kdeprint/descriptions/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdeprint/descriptions/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -63,18 +63,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(sortthem_SOURCES)
+ DIST_SOURCES = $(sortthem_SOURCES)
+@@ -266,6 +266,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@
+@@ -559,7 +562,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*) \
+@@ -597,9 +600,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
+ sortthem$(EXEEXT): $(sortthem_OBJECTS) $(sortthem_DEPENDENCIES) 
+ 	@rm -f sortthem$(EXEEXT)
+diff -Nrua kdebase-3.4.0.orig/kdeprint/kdeprint_part/Makefile.in kdebase-3.4.0/kdeprint/kdeprint_part/Makefile.in
+--- kdebase-3.4.0.orig/kdeprint/kdeprint_part/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kdeprint_part/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkdeprint_part_la_SOURCES)
+ DIST_SOURCES = $(libkdeprint_part_la_SOURCES)
+@@ -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@
+@@ -590,7 +593,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*) \
+@@ -628,9 +631,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)
+diff -Nrua kdebase-3.4.0.orig/kdeprint/kdeprintfax/Makefile.in kdebase-3.4.0/kdeprint/kdeprintfax/Makefile.in
+--- kdebase-3.4.0.orig/kdeprint/kdeprintfax/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kdeprintfax/Makefile.in	2005-03-04 19:44:28.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -83,18 +83,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdeprintfax_SOURCES)
+ DIST_SOURCES = $(kdeprintfax_SOURCES)
+@@ -295,6 +295,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@
+@@ -598,7 +601,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*) \
+@@ -636,9 +639,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -967,18 +970,18 @@
+ .NOEXPORT:
+ 
+ #>+ 3
+-faxab.moc: $(srcdir)/faxab.h
+-	$(MOC) $(srcdir)/faxab.h -o faxab.moc
++conffilters.moc: $(srcdir)/conffilters.h
++	$(MOC) $(srcdir)/conffilters.h -o conffilters.moc
+ 
+ #>+ 2
+-mocs: faxab.moc
++mocs: conffilters.moc
+ 
+ #>+ 3
+-conffilters.moc: $(srcdir)/conffilters.h
+-	$(MOC) $(srcdir)/conffilters.h -o conffilters.moc
++faxab.moc: $(srcdir)/faxab.h
++	$(MOC) $(srcdir)/faxab.h -o faxab.moc
+ 
+ #>+ 2
+-mocs: conffilters.moc
++mocs: faxab.moc
+ 
+ #>+ 3
+ confsystem.moc: $(srcdir)/confsystem.h
+@@ -1010,38 +1013,38 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  faxab.moc conffilters.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
++	-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 
+ 
+ #>+ 2
+ docs-am:
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(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/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kdeprintfax.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdeprintfax.svgz
++	$(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)$(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/16x16/apps/kdeprintfax.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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/48x48/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/scalable/apps/kdeprintfax.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdeprintfax.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdeprintfax.png
+ 	-rm -f $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
+ 
+ #>+ 15
+@@ -1083,7 +1086,7 @@
+ 
+ 
+ #>+ 11
+-kdeprintfax.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kdeprintfax.cpp $(srcdir)/faxab.cpp $(srcdir)/faxctrl.cpp $(srcdir)/confgeneral.cpp $(srcdir)/configdlg.cpp $(srcdir)/conffax.cpp $(srcdir)/confsystem.cpp $(srcdir)/conffilters.cpp $(srcdir)/filterdlg.cpp $(srcdir)/defcmds.cpp  conffilters.moc faxab.moc confsystem.moc faxctrl.moc filterdlg.moc kdeprintfax.moc
++kdeprintfax.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kdeprintfax.cpp $(srcdir)/faxab.cpp $(srcdir)/faxctrl.cpp $(srcdir)/confgeneral.cpp $(srcdir)/configdlg.cpp $(srcdir)/conffax.cpp $(srcdir)/confsystem.cpp $(srcdir)/conffilters.cpp $(srcdir)/filterdlg.cpp $(srcdir)/defcmds.cpp  faxab.moc conffilters.moc confsystem.moc faxctrl.moc filterdlg.moc kdeprintfax.moc
+ 	@echo 'creating kdeprintfax.all_cpp.cpp ...'; \
+ 	rm -f kdeprintfax.all_cpp.files kdeprintfax.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kdeprintfax.all_cpp.final; \
+diff -Nrua kdebase-3.4.0.orig/kdeprint/kjobviewer/Makefile.in kdebase-3.4.0/kdeprint/kjobviewer/Makefile.in
+--- kdebase-3.4.0.orig/kdeprint/kjobviewer/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kjobviewer/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -92,18 +92,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kjobviewer_la_SOURCES)
+ #>- DIST_SOURCES = $(kjobviewer_la_SOURCES)
+@@ -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@
+@@ -608,7 +611,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*) \
+@@ -646,9 +649,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)
+@@ -1051,29 +1054,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
++	$(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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-kjobviewer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kjobviewer.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjobviewer.png
+ 
+ uninstall-kde-icons:
++	-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/16x16/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)/crystalsvg/48x48/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/scalable/apps/kjobviewer.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kjobviewer.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/kdeprint/kprinter/Makefile.in kdebase-3.4.0/kdeprint/kprinter/Makefile.in
+--- kdebase-3.4.0.orig/kdeprint/kprinter/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdeprint/kprinter/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -89,18 +89,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kprinter_la_SOURCES)
+ #>- DIST_SOURCES = $(kprinter_la_SOURCES)
+@@ -295,6 +295,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@
+@@ -598,7 +601,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*) \
+@@ -636,9 +639,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)
+diff -Nrua kdebase-3.4.0.orig/kdeprint/printmgr/Makefile.in kdebase-3.4.0/kdeprint/printmgr/Makefile.in
+--- kdebase-3.4.0.orig/kdeprint/printmgr/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdeprint/printmgr/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_printmgr_la_SOURCES)
+ DIST_SOURCES = $(kcm_printmgr_la_SOURCES)
+@@ -282,6 +282,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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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)
+@@ -919,7 +922,7 @@
+ 
+ 
+ #>+ 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:
+@@ -930,29 +933,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/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/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-printmgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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)/crystalsvg/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-printmgr.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/printmgr.svgz
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/printmgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/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/32x32/apps/printmgr.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/printmgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/printmgr.svgz
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/kdeprint/slave/Makefile.in kdebase-3.4.0/kdeprint/slave/Makefile.in
+--- kdebase-3.4.0.orig/kdeprint/slave/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdeprint/slave/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_print_la_SOURCES)
+ DIST_SOURCES = $(kio_print_la_SOURCES)
+@@ -297,6 +297,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@
+@@ -598,7 +601,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*) \
+@@ -636,9 +639,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)
+@@ -736,7 +739,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -748,7 +757,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -756,7 +765,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -777,7 +792,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kdeprint/slave/mimetypes/Makefile.in kdebase-3.4.0/kdeprint/slave/mimetypes/Makefile.in
+--- kdebase-3.4.0.orig/kdeprint/slave/mimetypes/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdeprint/slave/mimetypes/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -536,7 +539,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*) \
+@@ -574,9 +577,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:
+diff -Nrua kdebase-3.4.0.orig/kdeprint/slave/templates/Makefile.in kdebase-3.4.0/kdeprint/slave/templates/Makefile.in
+--- kdebase-3.4.0.orig/kdeprint/slave/templates/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdeprint/slave/templates/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -563,7 +566,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*) \
+@@ -601,9 +604,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:
+diff -Nrua kdebase-3.4.0.orig/kdesktop/Makefile.in kdebase-3.4.0/kdesktop/Makefile.in
+--- kdebase-3.4.0.orig/kdesktop/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdesktop/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -115,29 +115,29 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdesktop_la_SOURCES) $(libkdesktopsettings_la_SOURCES) \
+ 	$(kcheckrunning_SOURCES)
+@@ -356,6 +356,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@
+@@ -694,7 +697,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .cc .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*) \
+@@ -732,9 +735,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)
+@@ -1048,7 +1051,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1060,7 +1069,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -1068,7 +1077,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -1089,7 +1104,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1416,18 +1431,18 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
+ 
+ #>+ 3
+-minicli.moc: $(srcdir)/minicli.h
+-	$(MOC) $(srcdir)/minicli.h -o minicli.moc
++krootwm.moc: $(srcdir)/krootwm.h
++	$(MOC) $(srcdir)/krootwm.h -o krootwm.moc
+ 
+ #>+ 2
+-mocs: minicli.moc
++mocs: krootwm.moc
+ 
+ #>+ 3
+-krootwm.moc: $(srcdir)/krootwm.h
+-	$(MOC) $(srcdir)/krootwm.h -o krootwm.moc
++minicli.moc: $(srcdir)/minicli.h
++	$(MOC) $(srcdir)/minicli.h -o minicli.moc
+ 
+ #>+ 2
+-mocs: krootwm.moc
++mocs: minicli.moc
+ 
+ #>+ 3
+ startupid.moc: $(srcdir)/startupid.h
+@@ -1451,6 +1466,13 @@
+ mocs: desktop.moc
+ 
+ #>+ 3
++pixmapserver.moc: $(srcdir)/pixmapserver.h
++	$(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
++
++#>+ 2
++mocs: pixmapserver.moc
++
++#>+ 3
+ kcustommenu.moc: $(srcdir)/kcustommenu.h
+ 	$(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc
+ 
+@@ -1465,13 +1487,6 @@
+ mocs: kdiconview.moc
+ 
+ #>+ 3
+-pixmapserver.moc: $(srcdir)/pixmapserver.h
+-	$(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
+-
+-#>+ 2
+-mocs: pixmapserver.moc
+-
+-#>+ 3
+ xautolock.moc: $(srcdir)/xautolock.h
+ 	$(MOC) $(srcdir)/xautolock.h -o xautolock.moc
+ 
+@@ -1496,7 +1511,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kcustommenu.moc kdiconview.moc pixmapserver.moc xautolock.moc bgmanager.moc
++	-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 
+@@ -1565,7 +1580,7 @@
+ 
+ 
+ #>+ 11
+-libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc  kdesktopsettings.h $(srcdir)/krootwm.cc  kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc  kdesktopsettings.h $(srcdir)/desktop.cc  klaunchsettings.h $(srcdir)/lockeng.cc  kdesktopsettings.h $(srcdir)/bgmanager.cc  kdesktopsettings.h $(srcdir)/init.cc  kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc bgmanager.moc xautolock.moc
++libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc  kdesktopsettings.h $(srcdir)/krootwm.cc  kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc  kdesktopsettings.h $(srcdir)/desktop.cc  klaunchsettings.h $(srcdir)/lockeng.cc  kdesktopsettings.h $(srcdir)/bgmanager.cc  kdesktopsettings.h $(srcdir)/init.cc  kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc pixmapserver.moc kcustommenu.moc bgmanager.moc xautolock.moc
+ 	@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; \
+@@ -1577,7 +1592,7 @@
+ 	rm -f libkdeinit_kdesktop_la.all_cc.final libkdeinit_kdesktop_la.all_cc.files
+ 
+ #>+ 11
+-libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp  kdesktopsettings.h $(srcdir)/startupid.cpp  klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc bgmanager.moc xautolock.moc
++libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp  kdesktopsettings.h $(srcdir)/startupid.cpp  klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc pixmapserver.moc kcustommenu.moc bgmanager.moc xautolock.moc
+ 	@echo 'creating libkdeinit_kdesktop_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeinit_kdesktop_la.all_cpp.files libkdeinit_kdesktop_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cpp.final; \
+diff -Nrua kdebase-3.4.0.orig/kdesktop/init/Makefile.in kdebase-3.4.0/kdesktop/init/Makefile.in
+--- kdebase-3.4.0.orig/kdesktop/init/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdesktop/init/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -263,6 +263,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@
+@@ -555,7 +558,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*) \
+@@ -593,9 +596,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:
+@@ -649,7 +652,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -661,7 +670,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -669,7 +678,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -690,7 +705,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kdesktop/init/Templates/Makefile.in kdebase-3.4.0/kdesktop/init/Templates/Makefile.in
+--- kdebase-3.4.0.orig/kdesktop/init/Templates/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdesktop/init/Templates/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -246,6 +246,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@
+@@ -551,7 +554,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*) \
+@@ -589,9 +592,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:
+@@ -774,7 +777,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=linkCDROM.desktop ZIP-Device.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop HTMLFile.html CAMERA-Device.desktop linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am 
++KDE_DIST=ZIP-Device.desktop linkCDROM.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop CAMERA-Device.desktop HTMLFile.html linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kdesktop/kwebdesktop/Makefile.in kdebase-3.4.0/kdesktop/kwebdesktop/Makefile.in
+--- kdebase-3.4.0.orig/kdesktop/kwebdesktop/Makefile.in	2005-03-04 08:14:55.000000000 -0500
++++ kdebase-3.4.0/kdesktop/kwebdesktop/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -74,18 +74,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwebdesktop_SOURCES)
+ DIST_SOURCES = $(kwebdesktop_SOURCES)
+@@ -286,6 +286,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@
+@@ -584,7 +587,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*) \
+@@ -622,9 +625,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kdesktop/lock/Makefile.in kdebase-3.4.0/kdesktop/lock/Makefile.in
+--- kdebase-3.4.0.orig/kdesktop/lock/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdesktop/lock/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdesktop_lock_SOURCES)
+ DIST_SOURCES = $(kdesktop_lock_SOURCES)
+@@ -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@
+@@ -578,7 +581,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -616,9 +619,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kdesktop/patterns/Makefile.in kdebase-3.4.0/kdesktop/patterns/Makefile.in
+--- kdebase-3.4.0.orig/kdesktop/patterns/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdesktop/patterns/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -538,7 +541,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*) \
+@@ -576,9 +579,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:
+diff -Nrua kdebase-3.4.0.orig/kdesktop/pics/Makefile.in kdebase-3.4.0/kdesktop/pics/Makefile.in
+--- kdebase-3.4.0.orig/kdesktop/pics/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdesktop/pics/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -247,6 +247,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@
+@@ -538,7 +541,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*) \
+@@ -576,9 +579,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:
+diff -Nrua kdebase-3.4.0.orig/kdesktop/programs/Makefile.in kdebase-3.4.0/kdesktop/programs/Makefile.in
+--- kdebase-3.4.0.orig/kdesktop/programs/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdesktop/programs/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/kdesu/Makefile.in kdebase-3.4.0/kdesu/Makefile.in
+--- kdebase-3.4.0.orig/kdesu/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdesu/Makefile.in	2005-03-04 19:44:29.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -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:
+@@ -600,7 +603,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -612,7 +621,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -620,7 +629,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -641,7 +656,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kdesu/kdesu/Makefile.in kdebase-3.4.0/kdesu/kdesu/Makefile.in
+--- kdebase-3.4.0.orig/kdesu/kdesu/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdesu/kdesu/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -73,18 +73,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdesu_SOURCES)
+ DIST_SOURCES = $(kdesu_SOURCES)
+@@ -277,6 +277,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@
+@@ -571,7 +574,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*) \
+@@ -609,9 +612,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kdesu/kdesud/Makefile.in kdebase-3.4.0/kdesu/kdesud/Makefile.in
+--- kdebase-3.4.0.orig/kdesu/kdesud/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdesu/kdesud/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdesud_SOURCES)
+ DIST_SOURCES = $(kdesud_SOURCES)
+@@ -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@
+@@ -572,7 +575,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*) \
+@@ -610,9 +613,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kdialog/Makefile.in kdebase-3.4.0/kdialog/Makefile.in
+--- kdebase-3.4.0.orig/kdialog/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdialog/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -73,18 +73,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdialog_SOURCES)
+ DIST_SOURCES = $(kdialog_SOURCES)
+@@ -276,6 +276,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@
+@@ -572,7 +575,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*) \
+@@ -610,9 +613,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kdm/Makefile.in kdebase-3.4.0/kdm/Makefile.in
+--- kdebase-3.4.0.orig/kdm/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdm/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -262,6 +262,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@
+@@ -555,7 +558,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*) \
+@@ -593,9 +596,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:
+@@ -632,7 +635,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -644,7 +653,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -652,7 +661,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -673,7 +688,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kdm/backend/Makefile.in kdebase-3.4.0/kdm/backend/Makefile.in
+--- kdebase-3.4.0.orig/kdm/backend/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdm/backend/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -94,11 +94,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdm_SOURCES)
+ DIST_SOURCES = $(kdm_SOURCES)
+@@ -291,6 +291,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@
+@@ -576,7 +579,7 @@
+ 
+ # forcibly remove thread-related defines & flags
+ AUTOMAKE_OPTIONS = foreign
+-LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) \
++LDADD = $(LIB_X11) -lXau_pic $(LIBXDMCP) $(PASSWDLIBS) \
+     $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
+     $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
+ 
+@@ -622,7 +625,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -660,9 +663,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/Makefile.in kdebase-3.4.0/kdm/kfrontend/Makefile.in
+--- kdebase-3.4.0.orig/kdm/kfrontend/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -101,29 +101,29 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(genkdmconf_SOURCES) $(kdm_config_SOURCES) \
+ 	$(kdm_greet_SOURCES) $(kdmctl_SOURCES) $(krootimage_SOURCES)
+@@ -332,6 +332,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@
+@@ -616,7 +619,7 @@
+ xdg_menudir = @xdg_menudir@
+ 
+ # use 'make GENKDMCONF_FLAGS=... install' to override
+-GENKDMCONF_FLAGS = 
++GENKDMCONF_FLAGS = --no-old
+ SUBDIRS = themer themes pics sessions
+ AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \
+     -I$(top_srcdir)/kdmlib $(all_includes)
+@@ -671,7 +674,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -709,9 +712,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -838,7 +841,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -850,7 +859,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -858,7 +867,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -879,7 +894,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1135,36 +1150,36 @@
+ mocs: kgverify.moc
+ 
+ #>+ 3
+-kdmclock.moc: $(srcdir)/kdmclock.h
+-	$(MOC) $(srcdir)/kdmclock.h -o kdmclock.moc
++kgreeter.moc: $(srcdir)/kgreeter.h
++	$(MOC) $(srcdir)/kgreeter.h -o kgreeter.moc
+ 
+ #>+ 2
+-mocs: kdmclock.moc
++mocs: kgreeter.moc
+ 
+ #>+ 3
+-kgreeter.moc: $(srcdir)/kgreeter.h
+-	$(MOC) $(srcdir)/kgreeter.h -o kgreeter.moc
++kchooser.moc: $(srcdir)/kchooser.h
++	$(MOC) $(srcdir)/kchooser.h -o kchooser.moc
+ 
+ #>+ 2
+-mocs: kgreeter.moc
++mocs: kchooser.moc
+ 
+ #>+ 3
+-kconsole.moc: $(srcdir)/kconsole.h
+-	$(MOC) $(srcdir)/kconsole.h -o kconsole.moc
++kdmclock.moc: $(srcdir)/kdmclock.h
++	$(MOC) $(srcdir)/kdmclock.h -o kdmclock.moc
+ 
+ #>+ 2
+-mocs: kconsole.moc
++mocs: kdmclock.moc
+ 
+ #>+ 3
+-kchooser.moc: $(srcdir)/kchooser.h
+-	$(MOC) $(srcdir)/kchooser.h -o kchooser.moc
++kconsole.moc: $(srcdir)/kconsole.h
++	$(MOC) $(srcdir)/kconsole.h -o kconsole.moc
+ 
+ #>+ 2
+-mocs: kchooser.moc
++mocs: kconsole.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  krootimage.moc kdmshutdown.moc kgdialog.moc kgverify.moc kdmclock.moc kgreeter.moc kconsole.moc kchooser.moc
++	-rm -f  krootimage.moc kdmshutdown.moc kgdialog.moc kgverify.moc kgreeter.moc kchooser.moc kdmclock.moc kconsole.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in Makefile.am 
+diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/pics/Makefile.in kdebase-3.4.0/kdm/kfrontend/pics/Makefile.in
+--- kdebase-3.4.0.orig/kdm/kfrontend/pics/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/pics/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -246,6 +246,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@
+@@ -538,7 +541,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*) \
+@@ -576,9 +579,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:
+diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/sessions/Makefile.in kdebase-3.4.0/kdm/kfrontend/sessions/Makefile.in
+--- kdebase-3.4.0.orig/kdm/kfrontend/sessions/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/sessions/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -246,6 +246,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@
+@@ -582,7 +585,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*) \
+@@ -620,9 +623,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
+ kde.desktop: $(top_builddir)/config.status $(srcdir)/kde.desktop.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+@@ -784,7 +787,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=9wm.desktop ratpoison.desktop golem.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in xfce.desktop wm2.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop waimea.desktop larswm.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am 
++KDE_DIST=9wm.desktop golem.desktop ratpoison.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in xfce.desktop wm2.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop larswm.desktop waimea.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/themer/Makefile.in kdebase-3.4.0/kdm/kfrontend/themer/Makefile.in
+--- kdebase-3.4.0.orig/kdm/kfrontend/themer/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/themer/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -73,18 +73,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkdmthemer_a_SOURCES)
+ DIST_SOURCES = $(libkdmthemer_a_SOURCES)
+@@ -276,6 +276,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@
+@@ -578,7 +581,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*) \
+@@ -616,9 +619,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-noinstLIBRARIES:
+@@ -862,18 +865,18 @@
+ mocs: kdmitem.moc
+ 
+ #>+ 3
+-kdmthemer.moc: $(srcdir)/kdmthemer.h
+-	$(MOC) $(srcdir)/kdmthemer.h -o kdmthemer.moc
++kdmpixmap.moc: $(srcdir)/kdmpixmap.h
++	$(MOC) $(srcdir)/kdmpixmap.h -o kdmpixmap.moc
+ 
+ #>+ 2
+-mocs: kdmthemer.moc
++mocs: kdmpixmap.moc
+ 
+ #>+ 3
+-kdmpixmap.moc: $(srcdir)/kdmpixmap.h
+-	$(MOC) $(srcdir)/kdmpixmap.h -o kdmpixmap.moc
++kdmthemer.moc: $(srcdir)/kdmthemer.h
++	$(MOC) $(srcdir)/kdmthemer.h -o kdmthemer.moc
+ 
+ #>+ 2
+-mocs: kdmpixmap.moc
++mocs: kdmthemer.moc
+ 
+ #>+ 3
+ kdmrect.moc: $(srcdir)/kdmrect.h
+@@ -884,7 +887,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kdmlabel.moc kdmitem.moc kdmthemer.moc kdmpixmap.moc kdmrect.moc
++	-rm -f  kdmlabel.moc kdmitem.moc kdmpixmap.moc kdmthemer.moc kdmrect.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in kdmthemer.h kdmitem.h kdmlayout.h kdmpixmap.h kdmlabel.h kdmrect.h Makefile.am 
+@@ -931,7 +934,7 @@
+ 
+ 
+ #>+ 11
+-libkdmthemer_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdmthemer.cpp $(srcdir)/kdmitem.cpp $(srcdir)/kdmpixmap.cpp $(srcdir)/kdmrect.cpp $(srcdir)/kdmlabel.cpp $(srcdir)/kdmlayout.cpp  kdmlabel.moc kdmitem.moc kdmpixmap.moc kdmthemer.moc kdmrect.moc
++libkdmthemer_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdmthemer.cpp $(srcdir)/kdmitem.cpp $(srcdir)/kdmpixmap.cpp $(srcdir)/kdmrect.cpp $(srcdir)/kdmlabel.cpp $(srcdir)/kdmlayout.cpp  kdmlabel.moc kdmitem.moc kdmthemer.moc kdmpixmap.moc kdmrect.moc
+ 	@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; \
+@@ -977,8 +980,8 @@
+ kdmlabel.o: kdmlabel.moc 
+ $(srcdir)/kdmitem.cpp: ../../config.ci 
+ $(srcdir)/kdmlayout.cpp: ../../config.ci 
+-kdmrect.o: kdmrect.moc 
+ kdmpixmap.o: kdmpixmap.moc 
++kdmrect.o: kdmrect.moc 
+ kdmitem.lo: kdmitem.moc 
+ kdmpixmap.lo: kdmpixmap.moc 
+ nmcheck: 
+diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/themes/Makefile.in kdebase-3.4.0/kdm/kfrontend/themes/Makefile.in
+--- kdebase-3.4.0.orig/kdm/kfrontend/themes/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/themes/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+@@ -599,7 +602,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -611,7 +620,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -619,7 +628,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -640,7 +655,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kdm/kfrontend/themes/circles/Makefile.in kdebase-3.4.0/kdm/kfrontend/themes/circles/Makefile.in
+--- kdebase-3.4.0.orig/kdm/kfrontend/themes/circles/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdm/kfrontend/themes/circles/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -543,7 +546,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*) \
+@@ -581,9 +584,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:
+diff -Nrua kdebase-3.4.0.orig/kdmlib/Makefile.in kdebase-3.4.0/kdmlib/Makefile.in
+--- kdebase-3.4.0.orig/kdmlib/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kdmlib/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -86,18 +86,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kgreet_classic_la_SOURCES) $(kgreet_winbind_la_SOURCES) \
+ 	$(libdmctl_la_SOURCES)
+@@ -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@
+@@ -602,7 +605,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*) \
+@@ -640,9 +643,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)
+diff -Nrua kdebase-3.4.0.orig/kfind/Makefile.in kdebase-3.4.0/kfind/Makefile.in
+--- kdebase-3.4.0.orig/kfind/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kfind/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -101,18 +101,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkfind_common_la_SOURCES) $(libkfindpart_la_SOURCES) \
+ 	$(kfind_SOURCES)
+@@ -325,6 +325,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@
+@@ -638,7 +641,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*) \
+@@ -676,9 +679,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)
+@@ -859,7 +862,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -871,7 +880,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -879,7 +888,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -900,7 +915,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1160,18 +1175,18 @@
+ mocs: kfindpart.moc
+ 
+ #>+ 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
+ 
+ #>+ 2
+-mocs: kquery.moc
++mocs: kdatecombo.moc
+ 
+ #>+ 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
+@@ -1205,7 +1220,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 
+@@ -1219,20 +1234,20 @@
+ 
+ #>+ 16
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfind.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfind.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfind.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfind.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfind.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kfind.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfind.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfind.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfind.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfind.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfind.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfind.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfind.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1273,7 +1288,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; \
+diff -Nrua kdebase-3.4.0.orig/kfind/pics/Makefile.in kdebase-3.4.0/kfind/pics/Makefile.in
+--- kdebase-3.4.0.orig/kfind/pics/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/kfind/pics/Makefile.in	2005-03-04 19:44:30.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -715,21 +718,21 @@
+ #>+ 19
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
+ 	$(INSTALL_DATA) $(srcdir)/lo22-action-delete.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/delete.png
++	$(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
++	$(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+ 	$(INSTALL_DATA) $(srcdir)/lo22-action-idea.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
+ 	$(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
+ 	$(INSTALL_DATA) $(srcdir)/lo22-action-openfile.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+ 	$(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
+ 	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/delete.png
++	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
++	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+ 	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
+ 	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
+ 	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
+-	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+ 	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
+ 
+ #>+ 15
+diff -Nrua kdebase-3.4.0.orig/khelpcenter/Makefile.in kdebase-3.4.0/khelpcenter/Makefile.in
+--- kdebase-3.4.0.orig/khelpcenter/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/Makefile.in	2005-03-04 19:44:31.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -109,18 +109,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(khelpcenter_la_SOURCES) $(khc_indexbuilder_SOURCES) \
+ 	$(testmetainfo_SOURCES)
+@@ -336,6 +336,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@
+@@ -676,7 +679,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*) \
+@@ -714,9 +717,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)
+@@ -951,7 +954,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -963,7 +972,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -971,7 +980,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -992,7 +1007,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1276,123 +1291,123 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmhelpcenter.kidl
+ 
+ #>+ 3
+-glossary.moc: $(srcdir)/glossary.h
+-	$(MOC) $(srcdir)/glossary.h -o glossary.moc
++history.moc: $(srcdir)/history.h
++	$(MOC) $(srcdir)/history.h -o history.moc
+ 
+ #>+ 2
+-mocs: glossary.moc
++mocs: history.moc
+ 
+ #>+ 3
+-infotree.moc: $(srcdir)/infotree.h
+-	$(MOC) $(srcdir)/infotree.h -o infotree.moc
++navigator.moc: $(srcdir)/navigator.h
++	$(MOC) $(srcdir)/navigator.h -o navigator.moc
+ 
+ #>+ 2
+-mocs: infotree.moc
++mocs: navigator.moc
+ 
+ #>+ 3
+-htmlsearchconfig.moc: $(srcdir)/htmlsearchconfig.h
+-	$(MOC) $(srcdir)/htmlsearchconfig.h -o htmlsearchconfig.moc
++scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
++	$(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
+ 
+ #>+ 2
+-mocs: htmlsearchconfig.moc
++mocs: scrollkeepertreebuilder.moc
+ 
+ #>+ 3
+-searchhandler.moc: $(srcdir)/searchhandler.h
+-	$(MOC) $(srcdir)/searchhandler.h -o searchhandler.moc
++fontdialog.moc: $(srcdir)/fontdialog.h
++	$(MOC) $(srcdir)/fontdialog.h -o fontdialog.moc
+ 
+ #>+ 2
+-mocs: searchhandler.moc
++mocs: fontdialog.moc
+ 
+ #>+ 3
+-view.moc: $(srcdir)/view.h
+-	$(MOC) $(srcdir)/view.h -o view.moc
++glossary.moc: $(srcdir)/glossary.h
++	$(MOC) $(srcdir)/glossary.h -o glossary.moc
+ 
+ #>+ 2
+-mocs: view.moc
++mocs: glossary.moc
+ 
+ #>+ 3
+-htmlsearch.moc: $(srcdir)/htmlsearch.h
+-	$(MOC) $(srcdir)/htmlsearch.h -o htmlsearch.moc
++treebuilder.moc: $(srcdir)/treebuilder.h
++	$(MOC) $(srcdir)/treebuilder.h -o treebuilder.moc
+ 
+ #>+ 2
+-mocs: htmlsearch.moc
++mocs: treebuilder.moc
+ 
+ #>+ 3
+-toc.moc: $(srcdir)/toc.h
+-	$(MOC) $(srcdir)/toc.h -o toc.moc
++infotree.moc: $(srcdir)/infotree.h
++	$(MOC) $(srcdir)/infotree.h -o infotree.moc
+ 
+ #>+ 2
+-mocs: toc.moc
++mocs: infotree.moc
+ 
+ #>+ 3
+-searchwidget.moc: $(srcdir)/searchwidget.h
+-	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
++htmlsearchconfig.moc: $(srcdir)/htmlsearchconfig.h
++	$(MOC) $(srcdir)/htmlsearchconfig.h -o htmlsearchconfig.moc
+ 
+ #>+ 2
+-mocs: searchwidget.moc
++mocs: htmlsearchconfig.moc
+ 
+ #>+ 3
+-searchengine.moc: $(srcdir)/searchengine.h
+-	$(MOC) $(srcdir)/searchengine.h -o searchengine.moc
++mainwindow.moc: $(srcdir)/mainwindow.h
++	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
+ 
+ #>+ 2
+-mocs: searchengine.moc
++mocs: mainwindow.moc
+ 
+ #>+ 3
+-khc_indexbuilder.moc: $(srcdir)/khc_indexbuilder.h
+-	$(MOC) $(srcdir)/khc_indexbuilder.h -o khc_indexbuilder.moc
++searchhandler.moc: $(srcdir)/searchhandler.h
++	$(MOC) $(srcdir)/searchhandler.h -o searchhandler.moc
+ 
+ #>+ 2
+-mocs: khc_indexbuilder.moc
++mocs: searchhandler.moc
+ 
+ #>+ 3
+-history.moc: $(srcdir)/history.h
+-	$(MOC) $(srcdir)/history.h -o history.moc
++kcmhelpcenter.moc: $(srcdir)/kcmhelpcenter.h
++	$(MOC) $(srcdir)/kcmhelpcenter.h -o kcmhelpcenter.moc
+ 
+ #>+ 2
+-mocs: history.moc
++mocs: kcmhelpcenter.moc
+ 
+ #>+ 3
+-navigator.moc: $(srcdir)/navigator.h
+-	$(MOC) $(srcdir)/navigator.h -o navigator.moc
++view.moc: $(srcdir)/view.h
++	$(MOC) $(srcdir)/view.h -o view.moc
+ 
+ #>+ 2
+-mocs: navigator.moc
++mocs: view.moc
+ 
+ #>+ 3
+-scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
+-	$(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
++htmlsearch.moc: $(srcdir)/htmlsearch.h
++	$(MOC) $(srcdir)/htmlsearch.h -o htmlsearch.moc
+ 
+ #>+ 2
+-mocs: scrollkeepertreebuilder.moc
++mocs: htmlsearch.moc
+ 
+ #>+ 3
+-fontdialog.moc: $(srcdir)/fontdialog.h
+-	$(MOC) $(srcdir)/fontdialog.h -o fontdialog.moc
++toc.moc: $(srcdir)/toc.h
++	$(MOC) $(srcdir)/toc.h -o toc.moc
+ 
+ #>+ 2
+-mocs: fontdialog.moc
++mocs: toc.moc
+ 
+ #>+ 3
+-treebuilder.moc: $(srcdir)/treebuilder.h
+-	$(MOC) $(srcdir)/treebuilder.h -o treebuilder.moc
++searchwidget.moc: $(srcdir)/searchwidget.h
++	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
+ 
+ #>+ 2
+-mocs: treebuilder.moc
++mocs: searchwidget.moc
+ 
+ #>+ 3
+-mainwindow.moc: $(srcdir)/mainwindow.h
+-	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
++khc_indexbuilder.moc: $(srcdir)/khc_indexbuilder.h
++	$(MOC) $(srcdir)/khc_indexbuilder.h -o khc_indexbuilder.moc
+ 
+ #>+ 2
+-mocs: mainwindow.moc
++mocs: khc_indexbuilder.moc
+ 
+ #>+ 3
+-kcmhelpcenter.moc: $(srcdir)/kcmhelpcenter.h
+-	$(MOC) $(srcdir)/kcmhelpcenter.h -o kcmhelpcenter.moc
++searchengine.moc: $(srcdir)/searchengine.h
++	$(MOC) $(srcdir)/searchengine.h -o searchengine.moc
+ 
+ #>+ 2
+-mocs: kcmhelpcenter.moc
++mocs: searchengine.moc
+ 
+ #>+ 8
+ khelpcenter.la.closure: $(khelpcenter_la_OBJECTS) $(khelpcenter_la_DEPENDENCIES)
+@@ -1405,7 +1420,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc view.moc htmlsearch.moc toc.moc searchwidget.moc searchengine.moc khc_indexbuilder.moc history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
++	-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 formatter.h application.h prefs.kcfgc README.metadata khelpcenter.kcfg docmetainfo.h Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am 
+@@ -1468,7 +1483,7 @@
+ 
+ 
+ #>+ 11
+-libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp  glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc view.moc htmlsearch.moc toc.moc searchwidget.moc searchengine.moc history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
++libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp  glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc searchengine.moc history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
+ 	@echo 'creating libkdeinit_khelpcenter_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeinit_khelpcenter_la.all_cpp.files libkdeinit_khelpcenter_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeinit_khelpcenter_la.all_cpp.final; \
+@@ -1534,8 +1549,8 @@
+ searchwidget.o: searchwidget.moc 
+ toc.lo: toc.moc 
+ $(srcdir)/htmlsearch.cpp: prefs.h 
+-treebuilder.lo: treebuilder.moc 
+ toc.o: toc.moc 
++treebuilder.lo: treebuilder.moc 
+ $(srcdir)/history.cpp: prefs.h 
+ infotree.lo: infotree.moc 
+ htmlsearch.o: htmlsearch.moc 
+@@ -1582,8 +1597,8 @@
+ glossary.o: glossary.moc 
+ searchengine.lo: searchengine.moc 
+ history.lo: history.moc 
+-kcmhelpcenter.lo: kcmhelpcenter.moc 
+ htmlsearchconfig.lo: htmlsearchconfig.moc 
++kcmhelpcenter.lo: kcmhelpcenter.moc 
+ $(srcdir)/htmlsearchconfig.cpp: prefs.h 
+ infotree.o: infotree.moc 
+ mainwindow.o: mainwindow.moc 
+diff -Nrua kdebase-3.4.0.orig/khelpcenter/htmlsearch/Makefile.in kdebase-3.4.0/khelpcenter/htmlsearch/Makefile.in
+--- kdebase-3.4.0.orig/khelpcenter/htmlsearch/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/htmlsearch/Makefile.in	2005-03-04 19:44:31.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -104,18 +104,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libhtmlsearch_la_SOURCES) $(libkcm_htmlsearch_la_SOURCES) \
+ 	$(khtmlindex_SOURCES)
+@@ -316,6 +316,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@
+@@ -630,7 +633,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*) \
+@@ -668,9 +671,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)
+diff -Nrua kdebase-3.4.0.orig/khelpcenter/pics/Makefile.in kdebase-3.4.0/khelpcenter/pics/Makefile.in
+--- kdebase-3.4.0.orig/khelpcenter/pics/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/pics/Makefile.in	2005-03-04 19:44:31.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -525,7 +528,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*) \
+@@ -563,9 +566,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:
+@@ -715,29 +718,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/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/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/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/khelpcenter.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/khelpcenter.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/khelpcenter.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/khelpcenter.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/khelpcenter.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/khelpcenter.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/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/64x64/apps/khelpcenter.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Applications/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Applications/Makefile.in
+--- kdebase-3.4.0.orig/khelpcenter/plugins/Applications/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Applications/Makefile.in	2005-03-04 19:44:31.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Makefile.in
+--- kdebase-3.4.0.orig/khelpcenter/plugins/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Makefile.in	2005-03-04 19:44:31.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -261,6 +261,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@
+@@ -555,7 +558,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*) \
+@@ -593,9 +596,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:
+@@ -632,7 +635,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -644,7 +653,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -652,7 +661,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -673,7 +688,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Manpages/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Manpages/Makefile.in
+--- kdebase-3.4.0.orig/khelpcenter/plugins/Manpages/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Manpages/Makefile.in	2005-03-04 19:44:31.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -536,7 +539,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*) \
+@@ -574,9 +577,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:
+diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Scrollkeeper/Makefile.in
+--- kdebase-3.4.0.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Scrollkeeper/Makefile.in	2005-03-04 19:44:31.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/khelpcenter/plugins/Tutorials/Makefile.in kdebase-3.4.0/khelpcenter/plugins/Tutorials/Makefile.in
+--- kdebase-3.4.0.orig/khelpcenter/plugins/Tutorials/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/plugins/Tutorials/Makefile.in	2005-03-04 19:44:31.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/khelpcenter/searchhandlers/Makefile.in kdebase-3.4.0/khelpcenter/searchhandlers/Makefile.in
+--- kdebase-3.4.0.orig/khelpcenter/searchhandlers/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khelpcenter/searchhandlers/Makefile.in	2005-03-04 19:44:31.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -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@
+@@ -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-kde_binSCRIPTS: $(kde_bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/khotkeys/Makefile.in kdebase-3.4.0/khotkeys/Makefile.in
+--- kdebase-3.4.0.orig/khotkeys/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khotkeys/Makefile.in	2005-03-04 19:44:31.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -262,6 +262,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@
+@@ -553,7 +556,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*) \
+@@ -591,9 +594,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:
+@@ -630,7 +633,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -642,7 +651,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -650,7 +659,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -671,7 +686,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/khotkeys/app/Makefile.in kdebase-3.4.0/khotkeys/app/Makefile.in
+--- kdebase-3.4.0.orig/khotkeys/app/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khotkeys/app/Makefile.in	2005-03-04 19:44:31.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -104,18 +104,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_khotkeys_la_SOURCES) $(khotkeys_la_SOURCES)
+ #>- DIST_SOURCES = $(kded_khotkeys_la_SOURCES) $(khotkeys_la_SOURCES)
+@@ -312,6 +312,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@
+@@ -625,7 +628,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*) \
+@@ -663,9 +666,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)
+diff -Nrua kdebase-3.4.0.orig/khotkeys/data/Makefile.in kdebase-3.4.0/khotkeys/data/Makefile.in
+--- kdebase-3.4.0.orig/khotkeys/data/Makefile.in	2005-03-04 08:14:56.000000000 -0500
++++ kdebase-3.4.0/khotkeys/data/Makefile.in	2005-03-04 19:44:32.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -247,6 +247,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+diff -Nrua kdebase-3.4.0.orig/khotkeys/kcontrol/Makefile.in kdebase-3.4.0/khotkeys/kcontrol/Makefile.in
+--- kdebase-3.4.0.orig/khotkeys/kcontrol/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/khotkeys/kcontrol/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -98,18 +98,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_khotkeys_la_SOURCES)
+ DIST_SOURCES = $(kcm_khotkeys_la_SOURCES)
+@@ -318,6 +318,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@
+@@ -634,7 +637,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*) \
+@@ -672,9 +675,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)
+@@ -796,7 +799,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -808,7 +817,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -816,7 +825,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -837,7 +852,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1079,18 +1094,18 @@
+ 
+ 
+ #>+ 3
+-windowdef_simple_widget.moc: $(srcdir)/windowdef_simple_widget.h
+-	$(MOC) $(srcdir)/windowdef_simple_widget.h -o windowdef_simple_widget.moc
++gesturedrawer.moc: $(srcdir)/gesturedrawer.h
++	$(MOC) $(srcdir)/gesturedrawer.h -o gesturedrawer.moc
+ 
+ #>+ 2
+-mocs: windowdef_simple_widget.moc
++mocs: gesturedrawer.moc
+ 
+ #>+ 3
+-gesturedrawer.moc: $(srcdir)/gesturedrawer.h
+-	$(MOC) $(srcdir)/gesturedrawer.h -o gesturedrawer.moc
++windowdef_simple_widget.moc: $(srcdir)/windowdef_simple_widget.h
++	$(MOC) $(srcdir)/windowdef_simple_widget.h -o windowdef_simple_widget.moc
+ 
+ #>+ 2
+-mocs: gesturedrawer.moc
++mocs: windowdef_simple_widget.moc
+ 
+ #>+ 3
+ gestures_settings_tab.moc: $(srcdir)/gestures_settings_tab.h
+@@ -1128,13 +1143,6 @@
+ mocs: tab_widget.moc
+ 
+ #>+ 3
+-condition_list_widget.moc: $(srcdir)/condition_list_widget.h
+-	$(MOC) $(srcdir)/condition_list_widget.h -o condition_list_widget.moc
+-
+-#>+ 2
+-mocs: condition_list_widget.moc
+-
+-#>+ 3
+ dcop_widget.moc: $(srcdir)/dcop_widget.h
+ 	$(MOC) $(srcdir)/dcop_widget.h -o dcop_widget.moc
+ 
+@@ -1142,11 +1150,11 @@
+ mocs: dcop_widget.moc
+ 
+ #>+ 3
+-action_list_widget.moc: $(srcdir)/action_list_widget.h
+-	$(MOC) $(srcdir)/action_list_widget.h -o action_list_widget.moc
++condition_list_widget.moc: $(srcdir)/condition_list_widget.h
++	$(MOC) $(srcdir)/condition_list_widget.h -o condition_list_widget.moc
+ 
+ #>+ 2
+-mocs: action_list_widget.moc
++mocs: condition_list_widget.moc
+ 
+ #>+ 3
+ actions_listview_widget.moc: $(srcdir)/actions_listview_widget.h
+@@ -1156,11 +1164,18 @@
+ mocs: actions_listview_widget.moc
+ 
+ #>+ 3
+-menuentry_widget.moc: $(srcdir)/menuentry_widget.h
+-	$(MOC) $(srcdir)/menuentry_widget.h -o menuentry_widget.moc
++action_list_widget.moc: $(srcdir)/action_list_widget.h
++	$(MOC) $(srcdir)/action_list_widget.h -o action_list_widget.moc
+ 
+ #>+ 2
+-mocs: menuentry_widget.moc
++mocs: action_list_widget.moc
++
++#>+ 3
++gesturerecorder.moc: $(srcdir)/gesturerecorder.h
++	$(MOC) $(srcdir)/gesturerecorder.h -o gesturerecorder.moc
++
++#>+ 2
++mocs: gesturerecorder.moc
+ 
+ #>+ 3
+ main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
+@@ -1170,11 +1185,11 @@
+ mocs: main_buttons_widget.moc
+ 
+ #>+ 3
+-gesturerecorder.moc: $(srcdir)/gesturerecorder.h
+-	$(MOC) $(srcdir)/gesturerecorder.h -o gesturerecorder.moc
++menuentry_widget.moc: $(srcdir)/menuentry_widget.h
++	$(MOC) $(srcdir)/menuentry_widget.h -o menuentry_widget.moc
+ 
+ #>+ 2
+-mocs: gesturerecorder.moc
++mocs: menuentry_widget.moc
+ 
+ #>+ 3
+ general_tab.moc: $(srcdir)/general_tab.h
+@@ -1198,18 +1213,18 @@
+ mocs: gesturerecordpage.moc
+ 
+ #>+ 3
+-windowselector.moc: $(srcdir)/windowselector.h
+-	$(MOC) $(srcdir)/windowselector.h -o windowselector.moc
++triggers_tab.moc: $(srcdir)/triggers_tab.h
++	$(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
+ 
+ #>+ 2
+-mocs: windowselector.moc
++mocs: triggers_tab.moc
+ 
+ #>+ 3
+-triggers_tab.moc: $(srcdir)/triggers_tab.h
+-	$(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
++windowselector.moc: $(srcdir)/windowselector.h
++	$(MOC) $(srcdir)/windowselector.h -o windowselector.moc
+ 
+ #>+ 2
+-mocs: triggers_tab.moc
++mocs: windowselector.moc
+ 
+ #>+ 3
+ command_url_widget.moc: $(srcdir)/command_url_widget.h
+@@ -1248,7 +1263,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  windowdef_simple_widget.moc gesturedrawer.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc kcmkhotkeys.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 windowselector.moc triggers_tab.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 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
+ 
+ #>+ 2
+ KDE_DIST=hi32-app-khotkeys.png Makefile.in khotkeys.desktop hi16-app-khotkeys.png Makefile.am 
+@@ -1310,7 +1325,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  gesturedrawer.moc windowdef_simple_widget.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc tab_widget.moc condition_list_widget.moc dcop_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 command_url_widget.moc triggers_tab.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  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
+ 	@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; \
+@@ -1397,6 +1412,6 @@
+ windowdef_list_widget.lo: windowdef_list_widget.moc 
+ gesture_triggers_tab.lo: gesture_triggers_tab.moc 
+ dcop_widget.lo: dcop_widget.moc 
+-condition_list_widget.o: condition_list_widget.moc 
+ tab_widget.lo: tab_widget.moc 
++condition_list_widget.o: condition_list_widget.moc 
+ windowselector.o: windowselector.moc 
+diff -Nrua kdebase-3.4.0.orig/khotkeys/kcontrol/ui/Makefile.in kdebase-3.4.0/khotkeys/kcontrol/ui/Makefile.in
+--- kdebase-3.4.0.orig/khotkeys/kcontrol/ui/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/khotkeys/kcontrol/ui/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -69,18 +69,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libui_la_SOURCES)
+ DIST_SOURCES = $(libui_la_SOURCES)
+@@ -272,6 +272,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@
+@@ -580,7 +583,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*) \
+@@ -618,9 +621,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:
+@@ -853,7 +856,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 
+ 
+ #>+ 21
+ clean-ui:
+diff -Nrua kdebase-3.4.0.orig/khotkeys/shared/Makefile.in kdebase-3.4.0/khotkeys/shared/Makefile.in
+--- kdebase-3.4.0.orig/khotkeys/shared/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/khotkeys/shared/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libshared_la_SOURCES)
+ DIST_SOURCES = $(libshared_la_SOURCES)
+@@ -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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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:
+@@ -907,22 +910,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 
+@@ -973,7 +976,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; \
+diff -Nrua kdebase-3.4.0.orig/khotkeys/update/Makefile.in kdebase-3.4.0/khotkeys/update/Makefile.in
+--- kdebase-3.4.0.orig/khotkeys/update/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/khotkeys/update/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -69,18 +69,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(khotkeys_update_SOURCES)
+ DIST_SOURCES = $(khotkeys_update_SOURCES)
+@@ -272,6 +272,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@
+@@ -566,7 +569,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*) \
+@@ -604,9 +607,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-kconfPROGRAMS: $(kconf_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kicker/Makefile.in kdebase-3.4.0/kicker/Makefile.in
+--- kdebase-3.4.0.orig/kicker/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -108,18 +108,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kicker_la_SOURCES) $(kicker_3_4_reverseLayout_SOURCES)
+ #>- DIST_SOURCES = $(kicker_la_SOURCES) \
+@@ -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@
+@@ -645,7 +648,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*) \
+@@ -683,9 +686,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)
+@@ -923,7 +926,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -935,7 +944,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -943,7 +952,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -964,7 +979,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/Makefile.in kdebase-3.4.0/kicker/applets/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+@@ -599,7 +602,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -611,7 +620,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -619,7 +628,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -640,7 +655,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/clock/Makefile.in kdebase-3.4.0/kicker/applets/clock/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/clock/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/clock/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(clock_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(clock_panelapplet_la_SOURCES)
+@@ -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@
+@@ -587,7 +590,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*) \
+@@ -625,9 +628,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/launcher/Makefile.in kdebase-3.4.0/kicker/applets/launcher/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/launcher/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/launcher/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -85,18 +85,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(launcher_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(launcher_panelapplet_la_SOURCES)
+@@ -291,6 +291,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@
+@@ -592,7 +595,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*) \
+@@ -630,9 +633,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/lockout/Makefile.in kdebase-3.4.0/kicker/applets/lockout/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/lockout/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/lockout/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(lockout_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(lockout_panelapplet_la_SOURCES)
+@@ -282,6 +282,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@
+@@ -580,7 +583,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*) \
+@@ -618,9 +621,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/media/Makefile.in kdebase-3.4.0/kicker/applets/media/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/media/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/media/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -83,18 +83,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(media_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(media_panelapplet_la_SOURCES)
+@@ -289,6 +289,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@
+@@ -587,7 +590,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*) \
+@@ -625,9 +628,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)
+@@ -918,18 +921,18 @@
+ 
+ 
+ #>+ 3
+-preferencesdialog.moc: $(srcdir)/preferencesdialog.h
+-	$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
++mediaapplet.moc: $(srcdir)/mediaapplet.h
++	$(MOC) $(srcdir)/mediaapplet.h -o mediaapplet.moc
+ 
+ #>+ 2
+-mocs: preferencesdialog.moc
++mocs: mediaapplet.moc
+ 
+ #>+ 3
+-mediaapplet.moc: $(srcdir)/mediaapplet.h
+-	$(MOC) $(srcdir)/mediaapplet.h -o mediaapplet.moc
++preferencesdialog.moc: $(srcdir)/preferencesdialog.h
++	$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
+ 
+ #>+ 2
+-mocs: mediaapplet.moc
++mocs: preferencesdialog.moc
+ 
+ #>+ 3
+ mediumbutton.moc: $(srcdir)/mediumbutton.h
+@@ -940,7 +943,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  preferencesdialog.moc mediaapplet.moc mediumbutton.moc
++	-rm -f  mediaapplet.moc preferencesdialog.moc mediumbutton.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in mediaapplet.desktop Makefile.am 
+@@ -991,7 +994,7 @@
+ 
+ 
+ #>+ 11
+-media_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/preferencesdialog.cpp $(srcdir)/mediumbutton.cpp $(srcdir)/mediaapplet.cpp  mediaapplet.moc preferencesdialog.moc mediumbutton.moc
++media_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/preferencesdialog.cpp $(srcdir)/mediumbutton.cpp $(srcdir)/mediaapplet.cpp  preferencesdialog.moc mediaapplet.moc mediumbutton.moc
+ 	@echo 'creating media_panelapplet_la.all_cpp.cpp ...'; \
+ 	rm -f media_panelapplet_la.all_cpp.files media_panelapplet_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> media_panelapplet_la.all_cpp.final; \
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/menu/Makefile.in kdebase-3.4.0/kicker/applets/menu/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/menu/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/menu/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(menu_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(menu_panelapplet_la_SOURCES)
+@@ -285,6 +285,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@
+@@ -585,7 +588,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*) \
+@@ -623,9 +626,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/minipager/Makefile.in kdebase-3.4.0/kicker/applets/minipager/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/minipager/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/minipager/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(minipager_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(minipager_panelapplet_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/naughty/Makefile.in kdebase-3.4.0/kicker/applets/naughty/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/naughty/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/naughty/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -83,18 +83,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(naughty_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(naughty_panelapplet_la_SOURCES)
+@@ -290,6 +290,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@
+@@ -598,7 +601,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*) \
+@@ -636,9 +639,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/run/Makefile.in kdebase-3.4.0/kicker/applets/run/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/run/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/run/Makefile.in	2005-03-04 19:44:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(run_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(run_panelapplet_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/swallow/Makefile.in kdebase-3.4.0/kicker/applets/swallow/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/swallow/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/swallow/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(swallow_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(swallow_panelapplet_la_SOURCES)
+@@ -287,6 +287,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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)
+@@ -916,22 +919,22 @@
+ 
+ 
+ #>+ 3
+-swallow.moc: $(srcdir)/swallow.h
+-	$(MOC) $(srcdir)/swallow.h -o swallow.moc
++prefwidget.moc: $(srcdir)/prefwidget.h
++	$(MOC) $(srcdir)/prefwidget.h -o prefwidget.moc
+ 
+ #>+ 2
+-mocs: swallow.moc
++mocs: prefwidget.moc
+ 
+ #>+ 3
+-prefwidget.moc: $(srcdir)/prefwidget.h
+-	$(MOC) $(srcdir)/prefwidget.h -o prefwidget.moc
++swallow.moc: $(srcdir)/swallow.h
++	$(MOC) $(srcdir)/swallow.h -o swallow.moc
+ 
+ #>+ 2
+-mocs: prefwidget.moc
++mocs: swallow.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  swallow.moc prefwidget.moc
++	-rm -f  prefwidget.moc swallow.moc
+ 
+ #>+ 2
+ KDE_DIST=swallowapplet.desktop Makefile.in prefwidgetbase.ui Makefile.am 
+@@ -987,7 +990,7 @@
+ 
+ 
+ #>+ 11
+-swallow_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/swallow.cpp $(srcdir)/prefwidget.cpp prefwidgetbase.cpp  prefwidgetbase.moc prefwidget.moc swallow.moc
++swallow_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/swallow.cpp $(srcdir)/prefwidget.cpp prefwidgetbase.cpp  prefwidgetbase.moc swallow.moc prefwidget.moc
+ 	@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; \
+@@ -1031,8 +1034,8 @@
+ swallow.o: swallow.moc 
+ $(srcdir)/prefwidget.cpp: prefwidgetbase.h 
+ nmcheck-am: nmcheck
+-prefwidget.lo: prefwidget.moc 
+ swallow.lo: swallow.moc 
++prefwidget.lo: prefwidget.moc 
+ $(srcdir)/swallow.cpp: prefwidgetbase.h 
+ prefwidget.o: prefwidget.moc 
+ 
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/systemtray/Makefile.in kdebase-3.4.0/kicker/applets/systemtray/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/systemtray/Makefile.in	2005-03-04 08:14:57.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/systemtray/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -83,18 +83,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(systemtray_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(systemtray_panelapplet_la_SOURCES)
+@@ -289,6 +289,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@
+@@ -589,7 +592,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*) \
+@@ -627,9 +630,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/taskbar/Makefile.in kdebase-3.4.0/kicker/applets/taskbar/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/taskbar/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/taskbar/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(taskbar_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(taskbar_panelapplet_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/applets/trash/Makefile.in kdebase-3.4.0/kicker/applets/trash/Makefile.in
+--- kdebase-3.4.0.orig/kicker/applets/trash/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/applets/trash/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(trash_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(trash_panelapplet_la_SOURCES)
+@@ -287,6 +287,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@
+@@ -587,7 +590,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*) \
+@@ -625,9 +628,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/buttons/Makefile.in kdebase-3.4.0/kicker/buttons/Makefile.in
+--- kdebase-3.4.0.orig/kicker/buttons/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/buttons/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkicker_buttons_la_SOURCES)
+ DIST_SOURCES = $(libkicker_buttons_la_SOURCES)
+@@ -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@
+@@ -578,7 +581,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*) \
+@@ -616,9 +619,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:
+@@ -884,18 +887,18 @@
+ mocs: urlbutton.moc
+ 
+ #>+ 3
+-windowlistbutton.moc: $(srcdir)/windowlistbutton.h
+-	$(MOC) $(srcdir)/windowlistbutton.h -o windowlistbutton.moc
++extensionbutton.moc: $(srcdir)/extensionbutton.h
++	$(MOC) $(srcdir)/extensionbutton.h -o extensionbutton.moc
+ 
+ #>+ 2
+-mocs: windowlistbutton.moc
++mocs: extensionbutton.moc
+ 
+ #>+ 3
+-extensionbutton.moc: $(srcdir)/extensionbutton.h
+-	$(MOC) $(srcdir)/extensionbutton.h -o extensionbutton.moc
++windowlistbutton.moc: $(srcdir)/windowlistbutton.h
++	$(MOC) $(srcdir)/windowlistbutton.h -o windowlistbutton.moc
+ 
+ #>+ 2
+-mocs: extensionbutton.moc
++mocs: windowlistbutton.moc
+ 
+ #>+ 3
+ servicebutton.moc: $(srcdir)/servicebutton.h
+@@ -905,6 +908,13 @@
+ mocs: servicebutton.moc
+ 
+ #>+ 3
++desktopbutton.moc: $(srcdir)/desktopbutton.h
++	$(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
++
++#>+ 2
++mocs: desktopbutton.moc
++
++#>+ 3
+ servicemenubutton.moc: $(srcdir)/servicemenubutton.h
+ 	$(MOC) $(srcdir)/servicemenubutton.h -o servicemenubutton.moc
+ 
+@@ -919,13 +929,6 @@
+ mocs: kbutton.moc
+ 
+ #>+ 3
+-desktopbutton.moc: $(srcdir)/desktopbutton.h
+-	$(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
+-
+-#>+ 2
+-mocs: desktopbutton.moc
+-
+-#>+ 3
+ nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
+ 	$(MOC) $(srcdir)/nonkdeappbutton.h -o nonkdeappbutton.moc
+ 
+@@ -941,7 +944,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc servicemenubutton.moc kbutton.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 
+@@ -988,7 +991,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 extensionbutton.moc windowlistbutton.moc servicebutton.moc desktopbutton.moc kbutton.moc servicemenubutton.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; \
+@@ -1031,8 +1034,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 
+diff -Nrua kdebase-3.4.0.orig/kicker/core/Makefile.in kdebase-3.4.0/kicker/core/Makefile.in
+--- kdebase-3.4.0.orig/kicker/core/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/core/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkicker_core_la_SOURCES)
+ DIST_SOURCES = $(libkicker_core_la_SOURCES)
+@@ -294,6 +294,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@
+@@ -612,7 +615,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*) \
+@@ -650,9 +653,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:
+@@ -967,18 +970,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
+@@ -995,18 +998,18 @@
+ mocs: applethandle.moc
+ 
+ #>+ 3
+-menumanager.moc: $(srcdir)/menumanager.h
+-	$(MOC) $(srcdir)/menumanager.h -o menumanager.moc
++containerarea.moc: $(srcdir)/containerarea.h
++	$(MOC) $(srcdir)/containerarea.h -o containerarea.moc
+ 
+ #>+ 2
+-mocs: menumanager.moc
++mocs: containerarea.moc
+ 
+ #>+ 3
+-containerarea.moc: $(srcdir)/containerarea.h
+-	$(MOC) $(srcdir)/containerarea.h -o containerarea.moc
++menumanager.moc: $(srcdir)/menumanager.h
++	$(MOC) $(srcdir)/menumanager.h -o menumanager.moc
+ 
+ #>+ 2
+-mocs: containerarea.moc
++mocs: menumanager.moc
+ 
+ #>+ 3
+ pluginmanager.moc: $(srcdir)/pluginmanager.h
+@@ -1066,7 +1069,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  container_extension.moc container_base.moc container_applet.moc applethandle.moc menumanager.moc containerarea.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.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 
+@@ -1124,7 +1127,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 containerarea.moc menumanager.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.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; \
+diff -Nrua kdebase-3.4.0.orig/kicker/data/Makefile.in kdebase-3.4.0/kicker/data/Makefile.in
+--- kdebase-3.4.0.orig/kicker/data/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/data/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+@@ -599,7 +602,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -611,7 +620,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -619,7 +628,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -640,7 +655,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kicker/data/app_start_anim/Makefile.in kdebase-3.4.0/kicker/data/app_start_anim/Makefile.in
+--- kdebase-3.4.0.orig/kicker/data/app_start_anim/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/data/app_start_anim/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kicker/data/icons/Makefile.in kdebase-3.4.0/kicker/data/icons/Makefile.in
+--- kdebase-3.4.0.orig/kicker/data/icons/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/data/icons/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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:
+@@ -600,7 +603,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -612,7 +621,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -620,7 +629,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -641,7 +656,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -866,45 +881,45 @@
+ 
+ #>+ 41
+ install-kde-icons:
+-	$(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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.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-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
+ 	$(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
+-	$(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)/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
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kmenu.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.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)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kmenu.svgz
+-	-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/48x48/apps/kmenu.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/64x64/apps/kmenu.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/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/128x128/apps/kmenu.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/32x32/apps/kmenu.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/kicker/data/icons/actions/Makefile.in kdebase-3.4.0/kicker/data/icons/actions/Makefile.in
+--- kdebase-3.4.0.orig/kicker/data/icons/actions/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/data/icons/actions/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/kicker/data/kmenu_side/Makefile.in kdebase-3.4.0/kicker/data/kmenu_side/Makefile.in
+--- kdebase-3.4.0.orig/kicker/data/kmenu_side/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/data/kmenu_side/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kicker/data/tiles/Makefile.in kdebase-3.4.0/kicker/data/tiles/Makefile.in
+--- kdebase-3.4.0.orig/kicker/data/tiles/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/data/tiles/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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:
+@@ -786,7 +789,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png solid_tigereye_normal_down.png KDE_button_tiny_up.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png green_wood_tiny_down.png KDE_button_normal_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_tigereye_tiny_up.png solid_gray_large_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png solid_gray_large_down.png light_pastel_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png solid_gray_normal_down.png light_pastel_normal_up.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png 
++KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png KDE_button_tiny_up.png solid_tigereye_normal_down.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png KDE_button_normal_down.png green_wood_tiny_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_gray_large_up.png solid_tigereye_tiny_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png solid_gray_large_down.png light_pastel_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png solid_gray_normal_down.png light_pastel_normal_up.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/kicker/data/wallpaper/Makefile.in kdebase-3.4.0/kicker/data/wallpaper/Makefile.in
+--- kdebase-3.4.0.orig/kicker/data/wallpaper/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/data/wallpaper/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kicker/extensions/Makefile.in kdebase-3.4.0/kicker/extensions/Makefile.in
+--- kdebase-3.4.0.orig/kicker/extensions/Makefile.in	2005-03-04 08:14:58.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+@@ -599,7 +602,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -611,7 +620,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -619,7 +628,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -640,7 +655,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kicker/extensions/dockbar/Makefile.in kdebase-3.4.0/kicker/extensions/dockbar/Makefile.in
+--- kdebase-3.4.0.orig/kicker/extensions/dockbar/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/dockbar/Makefile.in	2005-03-04 19:44:34.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(dockbar_panelextension_la_SOURCES)
+ DIST_SOURCES = $(dockbar_panelextension_la_SOURCES)
+@@ -288,6 +288,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/extensions/kasbar/Makefile.in kdebase-3.4.0/kicker/extensions/kasbar/Makefile.in
+--- kdebase-3.4.0.orig/kicker/extensions/kasbar/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/kasbar/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -104,18 +104,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kasbar_panelextension_la_SOURCES) $(libkasbar_la_SOURCES) \
+ 	$(kasbar_SOURCES)
+@@ -312,6 +312,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@
+@@ -639,7 +642,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*) \
+@@ -677,9 +680,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)
+@@ -1086,11 +1089,11 @@
+ mocs: kasbarextension.moc
+ 
+ #>+ 3
+-kasitem.moc: $(srcdir)/kasitem.h
+-	$(MOC) $(srcdir)/kasitem.h -o kasitem.moc
++kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
++	$(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
+ 
+ #>+ 2
+-mocs: kasitem.moc
++mocs: kasaboutdlg.moc
+ 
+ #>+ 3
+ kasclockitem.moc: $(srcdir)/kasclockitem.h
+@@ -1100,11 +1103,11 @@
+ mocs: kasclockitem.moc
+ 
+ #>+ 3
+-kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
+-	$(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
++kasitem.moc: $(srcdir)/kasitem.h
++	$(MOC) $(srcdir)/kasitem.h -o kasitem.moc
+ 
+ #>+ 2
+-mocs: kasaboutdlg.moc
++mocs: kasitem.moc
+ 
+ #>+ 3
+ kasresources.moc: $(srcdir)/kasresources.h
+@@ -1166,7 +1169,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasitem.moc kasclockitem.moc kasaboutdlg.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
++	-rm -f  kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasaboutdlg.moc kasclockitem.moc kasitem.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
+ 
+ #>+ 2
+ KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile docs.h kastaskpopup.h kasbarextension.desktop Makefile.am 
+@@ -1217,7 +1220,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 kasclockitem.moc kasitem.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; \
+diff -Nrua kdebase-3.4.0.orig/kicker/extensions/sidebar/Makefile.in kdebase-3.4.0/kicker/extensions/sidebar/Makefile.in
+--- kdebase-3.4.0.orig/kicker/extensions/sidebar/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/sidebar/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(sidebar_panelextension_la_SOURCES)
+ DIST_SOURCES = $(sidebar_panelextension_la_SOURCES)
+@@ -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@
+@@ -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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kicker/extensions/taskbar/Makefile.in kdebase-3.4.0/kicker/extensions/taskbar/Makefile.in
+--- kdebase-3.4.0.orig/kicker/extensions/taskbar/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/extensions/taskbar/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -83,18 +83,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(taskbar_panelextension_la_SOURCES)
+ DIST_SOURCES = $(taskbar_panelextension_la_SOURCES)
+@@ -289,6 +289,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@
+@@ -593,7 +596,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*) \
+@@ -631,9 +634,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/menuext/Makefile.in kdebase-3.4.0/kicker/menuext/Makefile.in
+--- kdebase-3.4.0.orig/kicker/menuext/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+@@ -599,7 +602,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -611,7 +620,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -619,7 +628,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -640,7 +655,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kicker/menuext/find/Makefile.in kdebase-3.4.0/kicker/menuext/find/Makefile.in
+--- kdebase-3.4.0.orig/kicker/menuext/find/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/find/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kickermenu_find_la_SOURCES)
+ DIST_SOURCES = $(kickermenu_find_la_SOURCES)
+@@ -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@
+@@ -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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kicker/menuext/kdeprint/Makefile.in kdebase-3.4.0/kicker/menuext/kdeprint/Makefile.in
+--- kdebase-3.4.0.orig/kicker/menuext/kdeprint/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/kdeprint/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kickermenu_kdeprint_la_SOURCES)
+ DIST_SOURCES = $(kickermenu_kdeprint_la_SOURCES)
+@@ -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@
+@@ -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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kicker/menuext/konq-profiles/Makefile.in kdebase-3.4.0/kicker/menuext/konq-profiles/Makefile.in
+--- kdebase-3.4.0.orig/kicker/menuext/konq-profiles/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/konq-profiles/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kickermenu_konqueror_la_SOURCES)
+ DIST_SOURCES = $(kickermenu_konqueror_la_SOURCES)
+@@ -282,6 +282,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@
+@@ -578,7 +581,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*) \
+@@ -616,9 +619,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/menuext/konsole/Makefile.in kdebase-3.4.0/kicker/menuext/konsole/Makefile.in
+--- kdebase-3.4.0.orig/kicker/menuext/konsole/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/konsole/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kickermenu_konsole_la_SOURCES)
+ DIST_SOURCES = $(kickermenu_konsole_la_SOURCES)
+@@ -286,6 +286,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@
+@@ -582,7 +585,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*) \
+@@ -620,9 +623,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/menuext/prefmenu/Makefile.in kdebase-3.4.0/kicker/menuext/prefmenu/Makefile.in
+--- kdebase-3.4.0.orig/kicker/menuext/prefmenu/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/prefmenu/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kickermenu_prefmenu_la_SOURCES)
+ DIST_SOURCES = $(kickermenu_prefmenu_la_SOURCES)
+@@ -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@
+@@ -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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kicker/menuext/recentdocs/Makefile.in kdebase-3.4.0/kicker/menuext/recentdocs/Makefile.in
+--- kdebase-3.4.0.orig/kicker/menuext/recentdocs/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/recentdocs/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kickermenu_recentdocs_la_SOURCES)
+ DIST_SOURCES = $(kickermenu_recentdocs_la_SOURCES)
+@@ -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@
+@@ -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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kicker/menuext/remote/Makefile.in kdebase-3.4.0/kicker/menuext/remote/Makefile.in
+--- kdebase-3.4.0.orig/kicker/menuext/remote/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/remote/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kickermenu_remotemenu_la_SOURCES)
+ DIST_SOURCES = $(kickermenu_remotemenu_la_SOURCES)
+@@ -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@
+@@ -582,7 +585,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*) \
+@@ -620,9 +623,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/menuext/system/Makefile.in kdebase-3.4.0/kicker/menuext/system/Makefile.in
+--- kdebase-3.4.0.orig/kicker/menuext/system/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/system/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kickermenu_systemmenu_la_SOURCES)
+ DIST_SOURCES = $(kickermenu_systemmenu_la_SOURCES)
+@@ -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@
+@@ -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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kicker/menuext/tom/Makefile.in kdebase-3.4.0/kicker/menuext/tom/Makefile.in
+--- kdebase-3.4.0.orig/kicker/menuext/tom/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/menuext/tom/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kickermenu_tom_la_SOURCES)
+ DIST_SOURCES = $(kickermenu_tom_la_SOURCES)
+@@ -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@
+@@ -580,7 +583,7 @@
+ 
+ .SUFFIXES:
+ .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 @@
+ $(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)
+diff -Nrua kdebase-3.4.0.orig/kicker/proxy/Makefile.in kdebase-3.4.0/kicker/proxy/Makefile.in
+--- kdebase-3.4.0.orig/kicker/proxy/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/proxy/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -105,18 +105,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) \
+ 	$(extensiondebugger_SOURCES)
+@@ -313,6 +313,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@
+@@ -620,7 +623,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*) \
+@@ -658,9 +661,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/share/Makefile.in kdebase-3.4.0/kicker/share/Makefile.in
+--- kdebase-3.4.0.orig/kicker/share/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/share/Makefile.in	2005-03-04 19:44:35.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkickermain_la_SOURCES)
+ DIST_SOURCES = $(libkickermain_la_SOURCES)
+@@ -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@
+@@ -584,7 +587,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*) \
+@@ -622,9 +625,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/taskbar/Makefile.in kdebase-3.4.0/kicker/taskbar/Makefile.in
+--- kdebase-3.4.0.orig/kicker/taskbar/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/taskbar/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libtaskbar_la_SOURCES)
+ DIST_SOURCES = $(libtaskbar_la_SOURCES)
+@@ -286,6 +286,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@
+@@ -592,7 +595,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*) \
+@@ -630,9 +633,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)
+diff -Nrua kdebase-3.4.0.orig/kicker/taskmanager/Makefile.in kdebase-3.4.0/kicker/taskmanager/Makefile.in
+--- kdebase-3.4.0.orig/kicker/taskmanager/Makefile.in	2005-03-04 08:14:59.000000000 -0500
++++ kdebase-3.4.0/kicker/taskmanager/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libtaskmanager_la_SOURCES)
+ DIST_SOURCES = $(libtaskmanager_la_SOURCES)
+@@ -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@
+@@ -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
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kicker/ui/Makefile.in kdebase-3.4.0/kicker/ui/Makefile.in
+--- kdebase-3.4.0.orig/kicker/ui/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kicker/ui/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -84,18 +84,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkicker_ui_la_SOURCES)
+ DIST_SOURCES = $(libkicker_ui_la_SOURCES)
+@@ -288,6 +288,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
+ 
+ clean-noinstLTLIBRARIES:
+@@ -999,18 +1002,18 @@
+ mocs: service_mnu.moc
+ 
+ #>+ 3
+-browser_dlg.moc: $(srcdir)/browser_dlg.h
+-	$(MOC) $(srcdir)/browser_dlg.h -o browser_dlg.moc
++addcontainer_mnu.moc: $(srcdir)/addcontainer_mnu.h
++	$(MOC) $(srcdir)/addcontainer_mnu.h -o addcontainer_mnu.moc
+ 
+ #>+ 2
+-mocs: browser_dlg.moc
++mocs: addcontainer_mnu.moc
+ 
+ #>+ 3
+-addcontainer_mnu.moc: $(srcdir)/addcontainer_mnu.h
+-	$(MOC) $(srcdir)/addcontainer_mnu.h -o addcontainer_mnu.moc
++browser_dlg.moc: $(srcdir)/browser_dlg.h
++	$(MOC) $(srcdir)/browser_dlg.h -o browser_dlg.moc
+ 
+ #>+ 2
+-mocs: addcontainer_mnu.moc
++mocs: browser_dlg.moc
+ 
+ #>+ 3
+ addbutton_mnu.moc: $(srcdir)/addbutton_mnu.h
+@@ -1027,18 +1030,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
+@@ -1056,7 +1059,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 service_mnu.moc browser_dlg.moc addcontainer_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 
+@@ -1108,7 +1111,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 service_mnu.moc browser_dlg.moc addcontainer_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; \
+diff -Nrua kdebase-3.4.0.orig/kioslave/Makefile.in kdebase-3.4.0/kioslave/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -253,6 +253,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@
+@@ -546,7 +549,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*) \
+@@ -584,9 +587,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:
+@@ -606,7 +609,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -618,7 +627,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -626,7 +635,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -647,7 +662,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kioslave/about/Makefile.in kdebase-3.4.0/kioslave/about/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/about/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/about/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_about_la_SOURCES)
+ DIST_SOURCES = $(kio_about_la_SOURCES)
+@@ -283,6 +283,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/cgi/Makefile.in kdebase-3.4.0/kioslave/cgi/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/cgi/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/cgi/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_cgi_la_SOURCES)
+ DIST_SOURCES = $(kio_cgi_la_SOURCES)
+@@ -297,6 +297,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@
+@@ -595,7 +598,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*) \
+@@ -633,9 +636,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)
+@@ -733,7 +736,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -745,7 +754,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -753,7 +762,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -774,7 +789,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kioslave/cgi/kcmcgi/Makefile.in kdebase-3.4.0/kioslave/cgi/kcmcgi/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/cgi/kcmcgi/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/cgi/kcmcgi/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_cgi_la_SOURCES)
+ DIST_SOURCES = $(kcm_cgi_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/filter/Makefile.in kdebase-3.4.0/kioslave/filter/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/filter/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/filter/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_filter_la_SOURCES)
+ DIST_SOURCES = $(kio_filter_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -582,7 +585,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -620,9 +623,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/finger/Makefile.in kdebase-3.4.0/kioslave/finger/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/finger/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/finger/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_finger_la_SOURCES)
+ DIST_SOURCES = $(kio_finger_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/fish/Makefile.in kdebase-3.4.0/kioslave/fish/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/fish/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/fish/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_fish_la_SOURCES)
+ DIST_SOURCES = $(kio_fish_la_SOURCES)
+@@ -283,6 +283,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/floppy/Makefile.in kdebase-3.4.0/kioslave/floppy/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/floppy/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/floppy/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_floppy_la_SOURCES)
+ DIST_SOURCES = $(kio_floppy_la_SOURCES)
+@@ -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@
+@@ -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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/info/Makefile.in kdebase-3.4.0/kioslave/info/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/info/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/info/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_info_la_SOURCES)
+ DIST_SOURCES = $(kio_info_la_SOURCES)
+@@ -288,6 +288,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@
+@@ -590,7 +593,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -628,9 +631,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/ldap/Makefile.in kdebase-3.4.0/kioslave/ldap/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/ldap/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/ldap/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_ldap_la_SOURCES)
+ DIST_SOURCES = $(kio_ldap_la_SOURCES)
+@@ -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@
+@@ -584,7 +587,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*) \
+@@ -622,9 +625,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/mac/Makefile.in kdebase-3.4.0/kioslave/mac/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/mac/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/mac/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_mac_la_SOURCES)
+ DIST_SOURCES = $(kio_mac_la_SOURCES)
+@@ -282,6 +282,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/man/Makefile.in kdebase-3.4.0/kioslave/man/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/man/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/man/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -98,18 +98,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_man_la_SOURCES) $(libkmanpart_la_SOURCES) \
+ 	$(kio_man_test_SOURCES) $(man2html_SOURCES)
+@@ -306,6 +306,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@
+@@ -617,7 +620,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*) \
+@@ -655,9 +658,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/media/Makefile.in kdebase-3.4.0/kioslave/media/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/media/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/Makefile.in	2005-03-04 19:44:36.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -90,18 +90,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_media_la_SOURCES) $(libkiomedia_la_SOURCES) \
+ 	$(testmedia_SOURCES)
+@@ -311,6 +311,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@
+@@ -616,7 +619,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*) \
+@@ -654,9 +657,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)
+@@ -778,7 +781,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -790,7 +799,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -798,7 +807,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -819,7 +834,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kioslave/media/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/media/kdedmodule/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/media/kdedmodule/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/kdedmodule/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -113,18 +113,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(halbackend_la_SOURCES) $(kded_mediamanager_la_SOURCES) \
+ 	$(liblinuxcdpolling_la_SOURCES)
+@@ -321,6 +321,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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kioslave/media/kfile-plugin/Makefile.in kdebase-3.4.0/kioslave/media/kfile-plugin/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/media/kfile-plugin/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/kfile-plugin/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kfile_media_la_SOURCES)
+ DIST_SOURCES = $(kfile_media_la_SOURCES)
+@@ -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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/media/libmediacommon/Makefile.in kdebase-3.4.0/kioslave/media/libmediacommon/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/media/libmediacommon/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/libmediacommon/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -64,18 +64,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libmediacommon_la_SOURCES)
+ DIST_SOURCES = $(libmediacommon_la_SOURCES)
+@@ -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@
+@@ -559,7 +562,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*) \
+@@ -597,9 +600,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:
+diff -Nrua kdebase-3.4.0.orig/kioslave/media/mimetypes/Makefile.in kdebase-3.4.0/kioslave/media/mimetypes/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/media/mimetypes/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/mimetypes/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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:
+diff -Nrua kdebase-3.4.0.orig/kioslave/media/mounthelper/Makefile.in kdebase-3.4.0/kioslave/media/mounthelper/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/media/mounthelper/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/mounthelper/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -68,18 +68,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_media_mounthelper_SOURCES)
+ DIST_SOURCES = $(kio_media_mounthelper_SOURCES)
+@@ -271,6 +271,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@
+@@ -565,7 +568,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*) \
+@@ -603,9 +606,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kioslave/media/services/Makefile.in kdebase-3.4.0/kioslave/media/services/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/media/services/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/media/services/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/kioslave/nfs/Makefile.in kdebase-3.4.0/kioslave/nfs/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/nfs/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/nfs/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,29 +77,29 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_nfs_la_SOURCES)
+ DIST_SOURCES = $(kio_nfs_la_SOURCES)
+@@ -294,6 +294,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@
+@@ -594,7 +597,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -632,9 +635,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/nntp/Makefile.in kdebase-3.4.0/kioslave/nntp/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/nntp/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/nntp/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_nntp_la_SOURCES)
+ DIST_SOURCES = $(kio_nntp_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -582,7 +585,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*) \
+@@ -620,9 +623,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/pop3/Makefile.in kdebase-3.4.0/kioslave/pop3/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/pop3/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/pop3/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_pop3_la_SOURCES)
+ DIST_SOURCES = $(kio_pop3_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -581,7 +584,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -619,9 +622,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/remote/Makefile.in kdebase-3.4.0/kioslave/remote/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/remote/Makefile.in	2005-03-04 08:15:00.000000000 -0500
++++ kdebase-3.4.0/kioslave/remote/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -89,18 +89,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_remote_la_SOURCES) $(libkioremote_la_SOURCES) \
+ 	$(testremote_SOURCES)
+@@ -310,6 +310,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@
+@@ -614,7 +617,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*) \
+@@ -652,9 +655,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)
+@@ -776,7 +779,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -788,7 +797,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -796,7 +805,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -817,7 +832,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kioslave/remote/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/remote/kdedmodule/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/remote/kdedmodule/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/remote/kdedmodule/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_remotedirnotify_la_SOURCES)
+ DIST_SOURCES = $(kded_remotedirnotify_la_SOURCES)
+@@ -286,6 +286,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@
+@@ -584,7 +587,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*) \
+@@ -622,9 +625,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/settings/Makefile.in kdebase-3.4.0/kioslave/settings/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/settings/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/settings/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_settings_la_SOURCES)
+ DIST_SOURCES = $(kio_settings_la_SOURCES)
+@@ -297,6 +297,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@
+@@ -596,7 +599,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -634,9 +637,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)
+@@ -734,7 +737,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -746,7 +755,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -754,7 +763,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -775,7 +790,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kioslave/sftp/Makefile.in kdebase-3.4.0/kioslave/sftp/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/sftp/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/sftp/Makefile.in	2005-03-04 19:44:37.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -89,18 +89,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_sftp_la_SOURCES) $(ksshprocesstest_SOURCES)
+ DIST_SOURCES = $(kio_sftp_la_SOURCES) $(ksshprocesstest_SOURCES)
+@@ -295,6 +295,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@
+@@ -595,7 +598,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*) \
+@@ -633,9 +636,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/smb/Makefile.in kdebase-3.4.0/kioslave/smb/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/smb/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/smb/Makefile.in	2005-03-04 19:44:38.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -85,18 +85,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_smb_la_SOURCES)
+ DIST_SOURCES = $(kio_smb_la_SOURCES)
+@@ -294,6 +294,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@
+@@ -607,7 +610,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*) \
+@@ -645,9 +648,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/smtp/Makefile.in kdebase-3.4.0/kioslave/smtp/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/smtp/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/smtp/Makefile.in	2005-03-04 19:44:38.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -106,18 +106,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_smtp_la_SOURCES) $(interactivesmtpserver_SOURCES) \
+ 	$(test_commands_SOURCES) $(test_headergeneration_SOURCES) \
+@@ -316,6 +316,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@
+@@ -626,7 +629,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -664,9 +667,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/system/Makefile.in kdebase-3.4.0/kioslave/system/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/system/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/Makefile.in	2005-03-04 19:44:38.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -89,18 +89,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_system_la_SOURCES) $(libkiosystem_la_SOURCES) \
+ 	$(testsystem_SOURCES)
+@@ -310,6 +310,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@
+@@ -613,7 +616,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*) \
+@@ -651,9 +654,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)
+@@ -775,7 +778,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -787,7 +796,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -795,7 +804,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -816,7 +831,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kioslave/system/entries/Makefile.in kdebase-3.4.0/kioslave/system/entries/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/system/entries/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/entries/Makefile.in	2005-03-04 19:44:38.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/kioslave/system/kdedmodule/Makefile.in kdebase-3.4.0/kioslave/system/kdedmodule/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/system/kdedmodule/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/kdedmodule/Makefile.in	2005-03-04 19:44:38.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_systemdirnotify_la_SOURCES)
+ DIST_SOURCES = $(kded_systemdirnotify_la_SOURCES)
+@@ -286,6 +286,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@
+@@ -584,7 +587,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*) \
+@@ -622,9 +625,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/system/mimetypes/Makefile.in kdebase-3.4.0/kioslave/system/mimetypes/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/system/mimetypes/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/system/mimetypes/Makefile.in	2005-03-04 19:44:38.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kioslave/tar/Makefile.in kdebase-3.4.0/kioslave/tar/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/tar/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/tar/Makefile.in	2005-03-04 19:44:38.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -83,18 +83,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_tar_la_SOURCES) $(ktartest_SOURCES)
+ DIST_SOURCES = $(kio_tar_la_SOURCES) $(ktartest_SOURCES)
+@@ -289,6 +289,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@
+@@ -589,7 +592,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .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*) \
+@@ -627,9 +630,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/thumbnail/Makefile.in kdebase-3.4.0/kioslave/thumbnail/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/thumbnail/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/thumbnail/Makefile.in	2005-03-04 19:44:39.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -119,18 +119,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(cursorthumbnail_la_SOURCES) $(djvuthumbnail_la_SOURCES) \
+ 	$(exrthumbnail_la_SOURCES) $(htmlthumbnail_la_SOURCES) \
+@@ -334,6 +334,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@
+@@ -672,7 +675,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*) \
+@@ -710,9 +713,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)
+diff -Nrua kdebase-3.4.0.orig/kioslave/trash/Makefile.in kdebase-3.4.0/kioslave/trash/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/trash/Makefile.in	2005-03-04 08:15:01.000000000 -0500
++++ kdebase-3.4.0/kioslave/trash/Makefile.in	2005-03-04 19:44:39.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -95,18 +95,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_trash_la_SOURCES) $(libtrashcommon_la_SOURCES) \
+ 	$(ktrash_SOURCES) $(testtrash_SOURCES)
+@@ -316,6 +316,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@
+@@ -623,7 +626,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*) \
+@@ -661,9 +664,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)
+@@ -816,7 +819,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -828,7 +837,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -836,7 +845,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -857,7 +872,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kioslave/trash/kfile-plugin/Makefile.in kdebase-3.4.0/kioslave/trash/kfile-plugin/Makefile.in
+--- kdebase-3.4.0.orig/kioslave/trash/kfile-plugin/Makefile.in	2005-03-04 08:15:02.000000000 -0500
++++ kdebase-3.4.0/kioslave/trash/kfile-plugin/Makefile.in	2005-03-04 19:44:39.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kfile_trash_la_SOURCES)
+ DIST_SOURCES = $(kfile_trash_la_SOURCES)
+@@ -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@
+@@ -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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/klipper/Makefile.in kdebase-3.4.0/klipper/Makefile.in
+--- kdebase-3.4.0.orig/klipper/Makefile.in	2005-03-04 08:15:02.000000000 -0500
++++ kdebase-3.4.0/klipper/Makefile.in	2005-03-04 19:44:39.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -120,18 +120,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \
+ 	$(libklipper_common_la_SOURCES)
+@@ -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@
+@@ -661,7 +664,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*) \
+@@ -699,9 +702,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)
+@@ -1234,13 +1237,6 @@
+ mocs: history.moc
+ 
+ #>+ 3
+-urlgrabber.moc: $(srcdir)/urlgrabber.h
+-	$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
+-
+-#>+ 2
+-mocs: urlgrabber.moc
+-
+-#>+ 3
+ configdialog.moc: $(srcdir)/configdialog.h
+ 	$(MOC) $(srcdir)/configdialog.h -o configdialog.moc
+ 
+@@ -1248,11 +1244,11 @@
+ mocs: configdialog.moc
+ 
+ #>+ 3
+-klipperpopup.moc: $(srcdir)/klipperpopup.h
+-	$(MOC) $(srcdir)/klipperpopup.h -o klipperpopup.moc
++urlgrabber.moc: $(srcdir)/urlgrabber.h
++	$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
+ 
+ #>+ 2
+-mocs: klipperpopup.moc
++mocs: urlgrabber.moc
+ 
+ #>+ 3
+ clipboardpoll.moc: $(srcdir)/clipboardpoll.h
+@@ -1262,6 +1258,13 @@
+ mocs: clipboardpoll.moc
+ 
+ #>+ 3
++klipperpopup.moc: $(srcdir)/klipperpopup.h
++	$(MOC) $(srcdir)/klipperpopup.h -o klipperpopup.moc
++
++#>+ 2
++mocs: klipperpopup.moc
++
++#>+ 3
+ toplevel.moc: $(srcdir)/toplevel.h
+ 	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+ 
+@@ -1284,7 +1287,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  history.moc urlgrabber.moc configdialog.moc klipperpopup.moc clipboardpoll.moc toplevel.moc popupproxy.moc applet.moc
++	-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 
+@@ -1300,29 +1303,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(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/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/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-klipper.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/klipper.png
+-	$(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/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/klipper.svgz
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/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/48x48/apps/klipper.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/klipper.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/klipper.svgz
+ 
+ #>+ 15
+ force-reedit:
+@@ -1375,7 +1378,7 @@
+ 	rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files
+ 
+ #>+ 11
+-libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp toplevel_skel.cpp  history.moc configdialog.moc urlgrabber.moc toplevel.moc popupproxy.moc clipboardpoll.moc klipperpopup.moc
++libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp toplevel_skel.cpp  history.moc urlgrabber.moc configdialog.moc toplevel.moc popupproxy.moc klipperpopup.moc clipboardpoll.moc
+ 	@echo 'creating libklipper_common_la.all_cpp.cpp ...'; \
+ 	rm -f libklipper_common_la.all_cpp.files libklipper_common_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libklipper_common_la.all_cpp.final; \
+@@ -1443,6 +1446,6 @@
+ history.lo: history.moc 
+ configdialog.lo: configdialog.moc 
+ applet.o: applet.moc 
+-klipperpopup.lo: klipperpopup.moc 
+ clipboardpoll.o: clipboardpoll.moc 
++klipperpopup.lo: klipperpopup.moc 
+ popupproxy.lo: popupproxy.moc 
+diff -Nrua kdebase-3.4.0.orig/kmenuedit/Makefile.in kdebase-3.4.0/kmenuedit/Makefile.in
+--- kdebase-3.4.0.orig/kmenuedit/Makefile.in	2005-03-04 08:15:02.000000000 -0500
++++ kdebase-3.4.0/kmenuedit/Makefile.in	2005-03-04 19:44:39.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -113,18 +113,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcontroledit_la_SOURCES) $(kmenuedit_la_SOURCES) \
+ 	$(libkmenueditcommon_la_SOURCES)
+@@ -340,6 +340,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@
+@@ -662,7 +665,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*) \
+@@ -700,9 +703,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)
+@@ -906,7 +909,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -918,7 +927,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -926,7 +935,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -947,7 +962,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1249,18 +1264,18 @@
+ kcontroledit_DEPENDENCIES = libkdeinit_kcontroledit.la
+ 
+ #>+ 3
+-treeview.moc: $(srcdir)/treeview.h
+-	$(MOC) $(srcdir)/treeview.h -o treeview.moc
++basictab.moc: $(srcdir)/basictab.h
++	$(MOC) $(srcdir)/basictab.h -o basictab.moc
+ 
+ #>+ 2
+-mocs: treeview.moc
++mocs: basictab.moc
+ 
+ #>+ 3
+-basictab.moc: $(srcdir)/basictab.h
+-	$(MOC) $(srcdir)/basictab.h -o basictab.moc
++treeview.moc: $(srcdir)/treeview.h
++	$(MOC) $(srcdir)/treeview.h -o treeview.moc
+ 
+ #>+ 2
+-mocs: basictab.moc
++mocs: treeview.moc
+ 
+ #>+ 3
+ kmenuedit.moc: $(srcdir)/kmenuedit.h
+@@ -1271,7 +1286,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  treeview.moc basictab.moc kmenuedit.moc
++	-rm -f  basictab.moc treeview.moc kmenuedit.moc
+ 
+ #>+ 2
+ KDE_DIST=cr48-app-kmenuedit.png Makefile.in uninstall.desktop kmenuedit.desktop kmenueditui.rc kcontroleditui.rc cr16-app-kmenuedit.png cr32-app-kmenuedit.png Makefile.am 
+@@ -1281,17 +1296,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(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/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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)/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
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenuedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenuedit.png
+ 	-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
+ 
+ #>+ 15
+ force-reedit:
+@@ -1332,7 +1347,7 @@
+ 
+ 
+ #>+ 11
+-libkmenueditcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/khotkeys.cpp $(srcdir)/menufile.cpp $(srcdir)/menuinfo.cpp  basictab.moc treeview.moc kmenuedit.moc
++libkmenueditcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/khotkeys.cpp $(srcdir)/menufile.cpp $(srcdir)/menuinfo.cpp  treeview.moc basictab.moc kmenuedit.moc
+ 	@echo 'creating libkmenueditcommon_la.all_cpp.cpp ...'; \
+ 	rm -f libkmenueditcommon_la.all_cpp.files libkmenueditcommon_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkmenueditcommon_la.all_cpp.final; \
+diff -Nrua kdebase-3.4.0.orig/kmenuedit/pixmaps/Makefile.in kdebase-3.4.0/kmenuedit/pixmaps/Makefile.in
+--- kdebase-3.4.0.orig/kmenuedit/pixmaps/Makefile.in	2005-03-04 08:15:02.000000000 -0500
++++ kdebase-3.4.0/kmenuedit/pixmaps/Makefile.in	2005-03-04 19:44:39.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -526,7 +529,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*) \
+@@ -564,9 +567,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:
+@@ -716,34 +719,34 @@
+ 
+ #>+ 30
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
++	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+-	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+-	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
++	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+-	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+-	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+ 
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
++	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+ 	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new.png
+-	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+ 	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
+-	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+-	-rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
++	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
++	-rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+ 	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new.png
+-	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+ 	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
+-	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+-	-rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/knetattach/Makefile.in kdebase-3.4.0/knetattach/Makefile.in
+--- kdebase-3.4.0.orig/knetattach/Makefile.in	2005-03-04 08:15:02.000000000 -0500
++++ kdebase-3.4.0/knetattach/Makefile.in	2005-03-04 19:44:39.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -72,18 +72,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(knetattach_SOURCES)
+ DIST_SOURCES = $(knetattach_SOURCES)
+@@ -283,6 +283,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@
+@@ -580,7 +583,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*) \
+@@ -618,9 +621,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -911,29 +914,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
++	$(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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knetattach.png
+-	$(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/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/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/knetattach.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-knetattach.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knetattach.png
+ 
+ uninstall-kde-icons:
++	-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/16x16/apps/knetattach.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/knetattach.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knetattach.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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/scalable/apps/knetattach.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knetattach.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/konqueror/Makefile.in kdebase-3.4.0/konqueror/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -102,18 +102,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konqueror_la_SOURCES)
+ #>- DIST_SOURCES = $(konqueror_la_SOURCES)
+@@ -330,6 +330,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@
+@@ -690,7 +693,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -728,9 +731,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)
+@@ -986,7 +989,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -998,7 +1007,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -1006,7 +1015,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -1027,7 +1042,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1368,18 +1383,18 @@
+ mocs: konq_mainwindow.moc
+ 
+ #>+ 3
+-konq_mainwindow_p.moc: $(srcdir)/konq_mainwindow_p.h
+-	$(MOC) $(srcdir)/konq_mainwindow_p.h -o konq_mainwindow_p.moc
++konq_actions.moc: $(srcdir)/konq_actions.h
++	$(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc
+ 
+ #>+ 2
+-mocs: konq_mainwindow_p.moc
++mocs: konq_actions.moc
+ 
+ #>+ 3
+-konq_actions.moc: $(srcdir)/konq_actions.h
+-	$(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc
++konq_mainwindow_p.moc: $(srcdir)/konq_mainwindow_p.h
++	$(MOC) $(srcdir)/konq_mainwindow_p.h -o konq_mainwindow_p.moc
+ 
+ #>+ 2
+-mocs: konq_actions.moc
++mocs: konq_mainwindow_p.moc
+ 
+ #>+ 3
+ konq_frame.moc: $(srcdir)/konq_frame.h
+@@ -1462,10 +1477,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  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_combo.moc konq_extensionmanager.moc
++	-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 
+ 
+ #>+ 6
+ clean-idl:
+@@ -1520,7 +1535,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_actions.moc konq_mainwindow_p.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 $(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
+ 	@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; \
+diff -Nrua kdebase-3.4.0.orig/konqueror/about/Makefile.in kdebase-3.4.0/konqueror/about/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/about/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/about/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konq_aboutpage_la_SOURCES)
+ DIST_SOURCES = $(konq_aboutpage_la_SOURCES)
+@@ -285,6 +285,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@
+@@ -587,7 +590,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -625,9 +628,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)
+diff -Nrua kdebase-3.4.0.orig/konqueror/client/Makefile.in kdebase-3.4.0/konqueror/client/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/client/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/client/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -95,18 +95,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kfmclient_la_SOURCES)
+ #>- DIST_SOURCES = $(kfmclient_la_SOURCES)
+@@ -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@
+@@ -612,7 +615,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -650,9 +653,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)
+diff -Nrua kdebase-3.4.0.orig/konqueror/iconview/Makefile.in kdebase-3.4.0/konqueror/iconview/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/iconview/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/iconview/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konq_iconview_la_SOURCES)
+ DIST_SOURCES = $(konq_iconview_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -581,7 +584,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -619,9 +622,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)
+diff -Nrua kdebase-3.4.0.orig/konqueror/keditbookmarks/Makefile.in kdebase-3.4.0/konqueror/keditbookmarks/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/keditbookmarks/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/keditbookmarks/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -97,18 +97,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(keditbookmarks_la_SOURCES) $(kbookmarkmerger_SOURCES)
+ #>- DIST_SOURCES = $(keditbookmarks_la_SOURCES) $(kbookmarkmerger_SOURCES)
+@@ -304,6 +304,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@
+@@ -617,7 +620,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*) \
+@@ -655,9 +658,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)
+@@ -1061,18 +1064,18 @@
+ mocs: favicons.moc
+ 
+ #>+ 3
+-bookmarkiterator.moc: $(srcdir)/bookmarkiterator.h
+-	$(MOC) $(srcdir)/bookmarkiterator.h -o bookmarkiterator.moc
++actionsimpl.moc: $(srcdir)/actionsimpl.h
++	$(MOC) $(srcdir)/actionsimpl.h -o actionsimpl.moc
+ 
+ #>+ 2
+-mocs: bookmarkiterator.moc
++mocs: actionsimpl.moc
+ 
+ #>+ 3
+-actionsimpl.moc: $(srcdir)/actionsimpl.h
+-	$(MOC) $(srcdir)/actionsimpl.h -o actionsimpl.moc
++bookmarkiterator.moc: $(srcdir)/bookmarkiterator.h
++	$(MOC) $(srcdir)/bookmarkiterator.h -o bookmarkiterator.moc
+ 
+ #>+ 2
+-mocs: actionsimpl.moc
++mocs: bookmarkiterator.moc
+ 
+ #>+ 3
+ updater.moc: $(srcdir)/updater.h
+@@ -1103,6 +1106,13 @@
+ mocs: bookmarkinfo.moc
+ 
+ #>+ 3
++testlink.moc: $(srcdir)/testlink.h
++	$(MOC) $(srcdir)/testlink.h -o testlink.moc
++
++#>+ 2
++mocs: testlink.moc
++
++#>+ 3
+ dcop.moc: $(srcdir)/dcop.h
+ 	$(MOC) $(srcdir)/dcop.h -o dcop.moc
+ 
+@@ -1117,18 +1127,11 @@
+ mocs: listview.moc
+ 
+ #>+ 3
+-testlink.moc: $(srcdir)/testlink.h
+-	$(MOC) $(srcdir)/testlink.h -o testlink.moc
+-
+-#>+ 2
+-mocs: testlink.moc
+-
+-#>+ 3
+ clean-metasources:
+-	-rm -f  favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc toplevel.moc importers.moc bookmarkinfo.moc dcop.moc listview.moc testlink.moc
++	-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 
+ 
+ #>+ 5
+ clean-idl:
+@@ -1141,20 +1144,20 @@
+ 
+ #>+ 16
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
+ 
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1195,7 +1198,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 actionsimpl.moc bookmarkiterator.moc updater.moc toplevel.moc importers.moc testlink.moc listview.moc bookmarkinfo.moc dcop.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
+ 	@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; \
+diff -Nrua kdebase-3.4.0.orig/konqueror/kttsplugin/Makefile.in kdebase-3.4.0/konqueror/kttsplugin/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/kttsplugin/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/kttsplugin/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkhtmlkttsdplugin_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlkttsdplugin_la_SOURCES)
+@@ -280,6 +280,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@
+@@ -578,7 +581,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*) \
+@@ -616,9 +619,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)
+diff -Nrua kdebase-3.4.0.orig/konqueror/listview/Makefile.in kdebase-3.4.0/konqueror/listview/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/listview/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/listview/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -85,18 +85,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konq_listview_la_SOURCES)
+ DIST_SOURCES = $(konq_listview_la_SOURCES)
+@@ -291,6 +291,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@
+@@ -597,7 +600,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -635,9 +638,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)
+@@ -990,7 +993,7 @@
+ 	-rm -f  konq_infolistviewwidget.moc konq_treeviewwidget.moc konq_textviewwidget.moc konq_listviewwidget.moc konq_listview.moc
+ 
+ #>+ 2
+-KDE_DIST=konq_infolistview.rc konq_detailedlistview.desktop konq_treeviewwidget.h konq_listviewitems.h konq_textview.rc Makefile.in konq_infolistviewitem.h konq_treeview.rc konq_listview.h konq_treeview.desktop konq_infolistview.desktop konq_treeviewitem.h konq_textviewitem.h konq_textviewwidget.h konq_textview.desktop konq_infolistviewwidget.h konq_listviewwidget.h konq_detailedlistview.rc Makefile.am 
++KDE_DIST=konq_infolistview.rc konq_detailedlistview.desktop konq_treeviewwidget.h konq_listviewitems.h konq_textview.rc Makefile.in konq_infolistviewitem.h konq_treeview.rc konq_listview.h konq_treeview.desktop konq_infolistview.desktop konq_treeviewitem.h konq_textviewitem.h konq_textviewwidget.h konq_textview.desktop konq_infolistviewwidget.h konq_listviewwidget.h Makefile.am konq_detailedlistview.rc 
+ 
+ #>+ 3
+ clean-closures:
+diff -Nrua kdebase-3.4.0.orig/konqueror/pics/Makefile.in kdebase-3.4.0/konqueror/pics/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/pics/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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:
+@@ -600,7 +603,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -612,7 +621,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -620,7 +629,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -641,7 +656,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -866,39 +881,39 @@
+ 
+ #>+ 35
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konqueror.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm.png
+ 	$(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/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/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kfm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kfm.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-konqueror.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konqueror.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqueror.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqueror.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm.png
+ 	-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/scalable/apps/konqueror.svgz
++	-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/16x16/apps/konqueror.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konqueror.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqueror.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/konqueror/pics/actions/Makefile.in kdebase-3.4.0/konqueror/pics/actions/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/pics/actions/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/actions/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+diff -Nrua kdebase-3.4.0.orig/konqueror/pics/indicators/Makefile.in kdebase-3.4.0/konqueror/pics/indicators/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/pics/indicators/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/indicators/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -536,7 +539,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*) \
+@@ -574,9 +577,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:
+diff -Nrua kdebase-3.4.0.orig/konqueror/pics/tiles/Makefile.in kdebase-3.4.0/konqueror/pics/tiles/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/pics/tiles/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/pics/tiles/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -536,7 +539,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*) \
+@@ -574,9 +577,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:
+diff -Nrua kdebase-3.4.0.orig/konqueror/preloader/Makefile.in kdebase-3.4.0/konqueror/preloader/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/preloader/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/preloader/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_konqy_preloader_la_SOURCES)
+ DIST_SOURCES = $(kded_konqy_preloader_la_SOURCES)
+@@ -285,6 +285,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@
+@@ -587,7 +590,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -625,9 +628,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)
+diff -Nrua kdebase-3.4.0.orig/konqueror/quickprint/Makefile.in kdebase-3.4.0/konqueror/quickprint/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/quickprint/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/quickprint/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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-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*) \
+@@ -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:
+@@ -740,7 +743,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=text-perl-print.desktop text-diff-print.desktop text-c-print.desktop text-python-print.desktop text-pas-print.desktop text-c++-print.desktop text-makefile-print.desktop Makefile.in text-ch-print.desktop text-print.desktop text-html-print.desktop text-tcl-print.desktop text-c++h-print.desktop text-css-print.desktop text-ada-print.desktop text-tex-print.desktop text-log-print.desktop text-java-print.desktop text-xml-print.desktop text-xslt-print.desktop Makefile.am 
++KDE_DIST=text-perl-print.desktop text-c-print.desktop text-diff-print.desktop text-python-print.desktop text-c++-print.desktop text-pas-print.desktop text-makefile-print.desktop Makefile.in text-ch-print.desktop text-print.desktop text-html-print.desktop text-tcl-print.desktop text-c++h-print.desktop text-ada-print.desktop text-css-print.desktop text-tex-print.desktop text-log-print.desktop text-java-print.desktop text-xml-print.desktop text-xslt-print.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nrua kdebase-3.4.0.orig/konqueror/remoteencodingplugin/Makefile.in kdebase-3.4.0/konqueror/remoteencodingplugin/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/remoteencodingplugin/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/remoteencodingplugin/Makefile.in	2005-03-04 19:44:41.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konq_remoteencoding_la_SOURCES)
+ DIST_SOURCES = $(konq_remoteencoding_la_SOURCES)
+@@ -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@
+@@ -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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/konqueror/shellcmdplugin/Makefile.in kdebase-3.4.0/konqueror/shellcmdplugin/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/shellcmdplugin/Makefile.in	2005-03-04 08:15:03.000000000 -0500
++++ kdebase-3.4.0/konqueror/shellcmdplugin/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konq_shellcmdplugin_la_SOURCES)
+ DIST_SOURCES = $(konq_shellcmdplugin_la_SOURCES)
+@@ -286,6 +286,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@
+@@ -586,7 +589,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*) \
+@@ -624,9 +627,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)
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/Makefile.in kdebase-3.4.0/konqueror/sidebar/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -98,18 +98,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konq_sidebar_la_SOURCES) \
+ 	$(libkonqsidebarplugin_la_SOURCES)
+@@ -325,6 +325,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@
+@@ -651,7 +654,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*) \
+@@ -689,9 +692,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)
+@@ -910,7 +913,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -922,7 +931,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -930,7 +939,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -951,7 +966,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/test/Makefile.in kdebase-3.4.0/konqueror/sidebar/test/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/test/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/test/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konq_sidebartest_la_SOURCES)
+ DIST_SOURCES = $(konq_sidebartest_la_SOURCES)
+@@ -298,6 +298,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)
+@@ -747,7 +750,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -759,7 +768,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -767,7 +776,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -788,7 +803,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/trees/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -85,18 +85,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konqsidebar_tree_la_SOURCES) \
+ 	$(libkonq_sidebar_tree_la_SOURCES)
+@@ -304,6 +304,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@
+@@ -607,7 +610,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*) \
+@@ -645,9 +648,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)
+@@ -742,7 +745,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -754,7 +763,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -762,7 +771,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -783,7 +798,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/bookmark_module/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/bookmark_module/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konq_sidebartree_bookmarks_la_SOURCES)
+ DIST_SOURCES = $(konq_sidebartree_bookmarks_la_SOURCES)
+@@ -282,6 +282,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@
+@@ -576,7 +579,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*) \
+@@ -614,9 +617,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)
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/dirtree_module/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/dirtree_module/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konq_sidebartree_dirtree_la_SOURCES)
+ DIST_SOURCES = $(konq_sidebartree_dirtree_la_SOURCES)
+@@ -282,6 +282,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@
+@@ -578,7 +581,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*) \
+@@ -616,9 +619,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)
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/history_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/history_module/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/trees/history_module/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/history_module/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -89,18 +89,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_history_la_SOURCES) \
+ 	$(konq_sidebartree_history_la_SOURCES)
+@@ -296,6 +296,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@
+@@ -603,7 +606,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*) \
+@@ -641,9 +644,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)
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -268,6 +268,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@
+@@ -568,7 +571,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*) \
+@@ -606,9 +609,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:
+@@ -696,7 +699,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -708,7 +717,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -716,7 +725,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -737,7 +752,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -261,6 +261,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@
+@@ -551,7 +554,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*) \
+@@ -589,9 +592,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:
+@@ -628,7 +631,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -640,7 +649,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -648,7 +657,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -669,7 +684,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/ftp/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/ftp/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/remote/web/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/remote/web/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/trees/init/services/Makefile.in kdebase-3.4.0/konqueror/sidebar/trees/init/services/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/trees/init/services/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/trees/init/services/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/konqueror/sidebar/web_module/Makefile.in kdebase-3.4.0/konqueror/sidebar/web_module/Makefile.in
+--- kdebase-3.4.0.orig/konqueror/sidebar/web_module/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konqueror/sidebar/web_module/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konqsidebar_web_la_SOURCES)
+ DIST_SOURCES = $(konqsidebar_web_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -584,7 +587,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*) \
+@@ -622,9 +625,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)
+diff -Nrua kdebase-3.4.0.orig/konsole/Makefile.in kdebase-3.4.0/konsole/Makefile.in
+--- kdebase-3.4.0.orig/konsole/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konsole/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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-updateSCRIPTS: $(update_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+@@ -779,7 +782,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -791,7 +800,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -799,7 +808,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -820,7 +835,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/konsole/doc/Makefile.in kdebase-3.4.0/konsole/doc/Makefile.in
+--- kdebase-3.4.0.orig/konsole/doc/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konsole/doc/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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:
+@@ -600,7 +603,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -612,7 +621,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -620,7 +629,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -641,7 +656,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/konsole/doc/VT100/Makefile.in kdebase-3.4.0/konsole/doc/VT100/Makefile.in
+--- kdebase-3.4.0.orig/konsole/doc/VT100/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konsole/doc/VT100/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -526,7 +529,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*) \
+@@ -564,9 +567,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:
+diff -Nrua kdebase-3.4.0.orig/konsole/fonts/Makefile.in kdebase-3.4.0/konsole/fonts/Makefile.in
+--- kdebase-3.4.0.orig/konsole/fonts/Makefile.in	2005-03-04 08:15:04.000000000 -0500
++++ kdebase-3.4.0/konsole/fonts/Makefile.in	2005-03-04 19:44:42.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/konsole/konsole/Makefile.in kdebase-3.4.0/konsole/konsole/Makefile.in
+--- kdebase-3.4.0.orig/konsole/konsole/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/konsole/konsole/Makefile.in	2005-03-04 19:44:44.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -131,18 +131,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_kwrited_la_SOURCES) $(konsole_la_SOURCES) \
+ 	$(libkonsolepart_la_SOURCES) $(fontembedder_SOURCES)
+@@ -342,6 +342,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@
+@@ -709,7 +712,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*) \
+@@ -747,9 +750,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)
+@@ -1224,18 +1227,18 @@
+ mocs: TEWidget.moc
+ 
+ #>+ 3
+-konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
+-	$(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
++TEmulation.moc: $(srcdir)/TEmulation.h
++	$(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc
+ 
+ #>+ 2
+-mocs: konsolebookmarkhandler.moc
++mocs: TEmulation.moc
+ 
+ #>+ 3
+-TEmulation.moc: $(srcdir)/TEmulation.h
+-	$(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc
++konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
++	$(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
+ 
+ #>+ 2
+-mocs: TEmulation.moc
++mocs: konsolebookmarkhandler.moc
+ 
+ #>+ 3
+ konsole.moc: $(srcdir)/konsole.h
+@@ -1259,18 +1262,18 @@
+ mocs: zmodem_dialog.moc
+ 
+ #>+ 3
+-session.moc: $(srcdir)/session.h
+-	$(MOC) $(srcdir)/session.h -o session.moc
++TEmuVt102.moc: $(srcdir)/TEmuVt102.h
++	$(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
+ 
+ #>+ 2
+-mocs: session.moc
++mocs: TEmuVt102.moc
+ 
+ #>+ 3
+-TEmuVt102.moc: $(srcdir)/TEmuVt102.h
+-	$(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
++session.moc: $(srcdir)/session.h
++	$(MOC) $(srcdir)/session.h -o session.moc
+ 
+ #>+ 2
+-mocs: TEmuVt102.moc
++mocs: session.moc
+ 
+ #>+ 3
+ konsole_part.moc: $(srcdir)/konsole_part.h
+@@ -1310,7 +1313,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kwrited.moc TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc session.moc TEmuVt102.moc konsole_part.moc printsettings.moc TEPty.moc
++	-rm -f  kwrited.moc TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc printsettings.moc TEPty.moc
+ 
+ #>+ 2
+ KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults Makefile.in konsole_part.h konsoleiface.h linefont.src Makefile.am 
+@@ -1370,7 +1373,7 @@
+ 
+ 
+ #>+ 11
+-libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc session.moc TEmuVt102.moc TEPty.moc printsettings.moc
++libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc TEPty.moc printsettings.moc
+ 	@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; \
+@@ -1394,7 +1397,7 @@
+ 	rm -f kded_kwrited_la.all_cpp.final kded_kwrited_la.all_cpp.files
+ 
+ #>+ 11
+-libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc TEmulation.moc zmodem_dialog.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc
++libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc TEmulation.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc TEPty.moc
+ 	@echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \
+ 	rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkonsolepart_la.all_cpp.final; \
+@@ -1452,8 +1455,8 @@
+ 	@rm -f konsole$(EXEEXT)
+ 	$(CXXLINK) $(konsole_LDFLAGS) $(konsole_OBJECTS) $(konsole_LDADD) $(LIBS)
+ 
+-TEmulation.lo: TEmulation.moc 
+ konsolebookmarkhandler.lo: konsolebookmarkhandler.moc 
++TEmulation.lo: TEmulation.moc 
+ konsole_part.o: konsole_part.moc 
+ konsolebookmarkhandler.o: konsolebookmarkhandler.moc 
+ nmcheck-am: nmcheck
+diff -Nrua kdebase-3.4.0.orig/konsole/other/Makefile.in kdebase-3.4.0/konsole/other/Makefile.in
+--- kdebase-3.4.0.orig/konsole/other/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/konsole/other/Makefile.in	2005-03-04 19:44:44.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -263,6 +263,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@
+@@ -567,7 +570,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*) \
+@@ -605,9 +608,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:
+@@ -661,7 +664,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -673,7 +682,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -681,7 +690,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -702,7 +717,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -934,29 +949,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konsole.png
+ 	$(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/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/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/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-konsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konsole.png
+ 	$(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/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
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/konsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konsole.png
+ 	-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/64x64/apps/konsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/konsole.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konsole.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/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
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/konsole/other/icons/Makefile.in kdebase-3.4.0/konsole/other/icons/Makefile.in
+--- kdebase-3.4.0.orig/konsole/other/icons/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/konsole/other/icons/Makefile.in	2005-03-04 19:44:44.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -524,7 +527,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*) \
+@@ -562,9 +565,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:
+@@ -707,30 +710,30 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr32-action-opentermred.png cr22-action-opentermblue.png Makefile.in cr16-action-opentermblue.png cr22-action-opentermred.png cr32-action-opentermblue.png cr16-action-opentermred.png Makefile.am 
++KDE_DIST=cr22-action-opentermblue.png cr32-action-opentermred.png Makefile.in cr16-action-opentermblue.png cr22-action-opentermred.png cr32-action-opentermblue.png cr16-action-opentermred.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+ 
+ #>+ 19
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
+ 	$(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/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
++	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.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
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/kpager/Makefile.in kdebase-3.4.0/kpager/Makefile.in
+--- kdebase-3.4.0.orig/kpager/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/kpager/Makefile.in	2005-03-04 19:44:44.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -74,18 +74,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kpager_SOURCES)
+ DIST_SOURCES = $(kpager_SOURCES)
+@@ -285,6 +285,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@
+@@ -585,7 +588,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*) \
+@@ -623,9 +626,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -953,16 +956,16 @@
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kpager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kpager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kpager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kpager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpager.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpager.png
+ 
+ #>+ 15
+diff -Nrua kdebase-3.4.0.orig/kpersonalizer/Makefile.in kdebase-3.4.0/kpersonalizer/Makefile.in
+--- kdebase-3.4.0.orig/kpersonalizer/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/kpersonalizer/Makefile.in	2005-03-04 19:44:44.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kpersonalizer_SOURCES)
+ DIST_SOURCES = $(kpersonalizer_SOURCES)
+@@ -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@
+@@ -629,7 +632,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*) \
+@@ -667,9 +670,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -774,7 +777,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -786,7 +795,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -794,7 +803,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -815,7 +830,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kpersonalizer/pics/Makefile.in kdebase-3.4.0/kpersonalizer/pics/Makefile.in
+--- kdebase-3.4.0.orig/kpersonalizer/pics/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/kpersonalizer/pics/Makefile.in	2005-03-04 19:44:44.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/kreadconfig/Makefile.in kdebase-3.4.0/kreadconfig/Makefile.in
+--- kdebase-3.4.0.orig/kreadconfig/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/kreadconfig/Makefile.in	2005-03-04 19:44:44.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kreadconfig_SOURCES) $(kwriteconfig_SOURCES)
+ DIST_SOURCES = $(kreadconfig_SOURCES) $(kwriteconfig_SOURCES)
+@@ -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@
+@@ -572,7 +575,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*) \
+@@ -610,9 +613,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kscreensaver/Makefile.in kdebase-3.4.0/kscreensaver/Makefile.in
+--- kdebase-3.4.0.orig/kscreensaver/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/kscreensaver/Makefile.in	2005-03-04 19:44:44.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kblankscrn_kss_SOURCES) $(krandom_kss_SOURCES)
+ DIST_SOURCES = $(kblankscrn_kss_SOURCES) $(krandom_kss_SOURCES)
+@@ -289,6 +289,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@
+@@ -590,7 +593,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*) \
+@@ -628,9 +631,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/ksmserver/Makefile.in kdebase-3.4.0/ksmserver/Makefile.in
+--- kdebase-3.4.0.orig/ksmserver/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksmserver/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -120,18 +120,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ksmserver_la_SOURCES) $(testsh_SOURCES)
+ #>- DIST_SOURCES = $(ksmserver_la_SOURCES) $(testsh_SOURCES)
+@@ -343,6 +343,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@
+@@ -658,7 +661,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*) \
+@@ -696,9 +699,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)
+@@ -890,7 +893,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -902,7 +911,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -910,7 +919,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -931,7 +946,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/ksplashml/Makefile.in kdebase-3.4.0/ksplashml/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ksplash_SOURCES)
+ DIST_SOURCES = $(ksplash_SOURCES)
+@@ -302,6 +302,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@
+@@ -601,7 +604,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*) \
+@@ -639,9 +642,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -739,7 +742,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -751,7 +760,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -759,7 +768,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -780,7 +795,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/ksplashml/kcmksplash/Makefile.in kdebase-3.4.0/ksplashml/kcmksplash/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/kcmksplash/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/kcmksplash/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_ksplashthemes_la_SOURCES)
+ DIST_SOURCES = $(kcm_ksplashthemes_la_SOURCES)
+@@ -300,6 +300,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@
+@@ -599,7 +602,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*) \
+@@ -637,9 +640,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)
+@@ -738,7 +741,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -750,7 +759,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -758,7 +767,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -779,7 +794,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/ksplashml/kcmksplash/pics/Makefile.in kdebase-3.4.0/ksplashml/kcmksplash/pics/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/kcmksplash/pics/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/kcmksplash/pics/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -523,7 +526,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*) \
+@@ -561,9 +564,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:
+@@ -713,25 +716,25 @@
+ 
+ #>+ 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/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/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/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
+ 
+ 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/22x22/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/128x128/apps/ksplash.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksplash.png
+ 
+ #>+ 15
+diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/Makefile.in kdebase-3.4.0/ksplashml/pics/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/pics/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -261,6 +261,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-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*) \
+@@ -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:
+@@ -629,7 +632,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -641,7 +650,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -649,7 +658,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -670,7 +685,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/pics/themes/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -535,13 +538,13 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. blue-bend default none simple
++SUBDIRS =. none default simple blue-bend
+ #>- all: all-recursive
+ #>+ 1
+ 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*) \
+@@ -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:
+@@ -601,7 +604,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -613,7 +622,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -621,7 +630,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -642,7 +657,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/blue-bend/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/blue-bend/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/pics/themes/blue-bend/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/blue-bend/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/default/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/default/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/pics/themes/default/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/default/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -261,6 +261,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-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*) \
+@@ -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:
+@@ -629,7 +632,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -641,7 +650,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -649,7 +658,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -670,7 +685,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/default/locolor/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/default/locolor/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/pics/themes/default/locolor/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/default/locolor/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/none/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/none/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/pics/themes/none/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/none/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/ksplashml/pics/themes/simple/Makefile.in kdebase-3.4.0/ksplashml/pics/themes/simple/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/pics/themes/simple/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/pics/themes/simple/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/Makefile.in kdebase-3.4.0/ksplashml/themeengine/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/themeengine/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libksplashthemes_la_SOURCES)
+ DIST_SOURCES = $(libksplashthemes_la_SOURCES)
+@@ -304,6 +304,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@
+@@ -602,7 +605,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*) \
+@@ -640,9 +643,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)
+@@ -755,7 +758,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -767,7 +776,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -775,7 +784,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -796,7 +811,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/default/Makefile.in kdebase-3.4.0/ksplashml/themeengine/default/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/themeengine/default/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/default/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ksplashdefault_la_SOURCES) $(libthemedefault_la_SOURCES)
+ DIST_SOURCES = $(ksplashdefault_la_SOURCES) \
+@@ -288,6 +288,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@
+@@ -588,7 +591,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*) \
+@@ -626,9 +629,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)
+diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/redmond/Makefile.in kdebase-3.4.0/ksplashml/themeengine/redmond/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/themeengine/redmond/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/redmond/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ksplashredmond_la_SOURCES)
+ DIST_SOURCES = $(ksplashredmond_la_SOURCES)
+@@ -302,6 +302,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@
+@@ -602,7 +605,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*) \
+@@ -640,9 +643,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)
+@@ -758,7 +761,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -770,7 +779,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -778,7 +787,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -799,7 +814,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/redmond/pics/Makefile.in kdebase-3.4.0/ksplashml/themeengine/redmond/pics/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/themeengine/redmond/pics/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/redmond/pics/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/simple/Makefile.in kdebase-3.4.0/ksplashml/themeengine/simple/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/themeengine/simple/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/simple/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -69,18 +69,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ksplashsimple_SOURCES)
+ DIST_SOURCES = $(ksplashsimple_SOURCES)
+@@ -272,6 +272,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@
+@@ -564,7 +567,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*) \
+@@ -602,9 +605,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/standard/Makefile.in kdebase-3.4.0/ksplashml/themeengine/standard/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/themeengine/standard/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/standard/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -89,18 +89,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ksplashstandard_la_SOURCES) $(libthemestandard_la_SOURCES)
+ DIST_SOURCES = $(ksplashstandard_la_SOURCES) \
+@@ -311,6 +311,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@
+@@ -615,7 +618,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*) \
+@@ -653,9 +656,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)
+@@ -784,7 +787,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -796,7 +805,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -804,7 +813,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -825,7 +840,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/ksplashml/themeengine/standard/pics/Makefile.in kdebase-3.4.0/ksplashml/themeengine/standard/pics/Makefile.in
+--- kdebase-3.4.0.orig/ksplashml/themeengine/standard/pics/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksplashml/themeengine/standard/pics/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,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:
+diff -Nrua kdebase-3.4.0.orig/kstart/Makefile.in kdebase-3.4.0/kstart/Makefile.in
+--- kdebase-3.4.0.orig/kstart/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/kstart/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -72,18 +72,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kstart_SOURCES)
+ DIST_SOURCES = $(kstart_SOURCES)
+@@ -276,6 +276,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@
+@@ -572,7 +575,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*) \
+@@ -610,9 +613,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/ksysguard/CContLib/Makefile.in kdebase-3.4.0/ksysguard/CContLib/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/CContLib/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksysguard/CContLib/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -65,11 +65,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libccont_a_SOURCES)
+ DIST_SOURCES = $(libccont_a_SOURCES)
+@@ -262,6 +262,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@
+@@ -554,7 +557,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -592,9 +595,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-noinstLIBRARIES:
+diff -Nrua kdebase-3.4.0.orig/ksysguard/Makefile.in kdebase-3.4.0/ksysguard/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksysguard/Makefile.in	2005-03-04 19:44:45.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -543,7 +546,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*) \
+@@ -581,9 +584,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:
+@@ -603,7 +606,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -615,7 +624,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -623,7 +632,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -644,7 +659,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -873,18 +888,18 @@
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksysguard.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysguard.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksysguard.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysguard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
+ 
+ #>+ 15
+diff -Nrua kdebase-3.4.0.orig/ksysguard/example/Makefile.in kdebase-3.4.0/ksysguard/example/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/example/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksysguard/example/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -247,6 +247,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@
+@@ -538,7 +541,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*) \
+@@ -576,9 +579,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:
+diff -Nrua kdebase-3.4.0.orig/ksysguard/gui/Makefile.in kdebase-3.4.0/ksysguard/gui/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/gui/Makefile.in	2005-03-04 08:15:05.000000000 -0500
++++ kdebase-3.4.0/ksysguard/gui/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -105,29 +105,29 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(sysguard_panelapplet_la_SOURCES) $(kpm_SOURCES) \
+ 	$(ksysguard_SOURCES)
+@@ -342,6 +342,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@
+@@ -685,7 +688,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -723,9 +726,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)
+@@ -953,7 +956,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -965,7 +974,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -973,7 +982,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -994,7 +1009,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/ksysguard/gui/SensorDisplayLib/Makefile.in kdebase-3.4.0/ksysguard/gui/SensorDisplayLib/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/gui/SensorDisplayLib/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksysguard/gui/SensorDisplayLib/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -79,18 +79,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libsensordisplays_la_SOURCES)
+ DIST_SOURCES = $(libsensordisplays_la_SOURCES)
+@@ -282,6 +282,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@
+@@ -635,7 +638,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -673,9 +676,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:
+@@ -955,18 +958,18 @@
+ mocs: DummyDisplay.moc
+ 
+ #>+ 3
+-SensorLoggerDlg.moc: $(srcdir)/SensorLoggerDlg.h
+-	$(MOC) $(srcdir)/SensorLoggerDlg.h -o SensorLoggerDlg.moc
++FancyPlotterSettings.moc: $(srcdir)/FancyPlotterSettings.h
++	$(MOC) $(srcdir)/FancyPlotterSettings.h -o FancyPlotterSettings.moc
+ 
+ #>+ 2
+-mocs: SensorLoggerDlg.moc
++mocs: FancyPlotterSettings.moc
+ 
+ #>+ 3
+-FancyPlotterSettings.moc: $(srcdir)/FancyPlotterSettings.h
+-	$(MOC) $(srcdir)/FancyPlotterSettings.h -o FancyPlotterSettings.moc
++SensorLoggerDlg.moc: $(srcdir)/SensorLoggerDlg.h
++	$(MOC) $(srcdir)/SensorLoggerDlg.h -o SensorLoggerDlg.moc
+ 
+ #>+ 2
+-mocs: FancyPlotterSettings.moc
++mocs: SensorLoggerDlg.moc
+ 
+ #>+ 3
+ LogFile.moc: $(srcdir)/LogFile.h
+@@ -997,18 +1000,18 @@
+ mocs: ListView.moc
+ 
+ #>+ 3
+-ReniceDlg.moc: $(srcdir)/ReniceDlg.h
+-	$(MOC) $(srcdir)/ReniceDlg.h -o ReniceDlg.moc
++SensorLogger.moc: $(srcdir)/SensorLogger.h
++	$(MOC) $(srcdir)/SensorLogger.h -o SensorLogger.moc
+ 
+ #>+ 2
+-mocs: ReniceDlg.moc
++mocs: SensorLogger.moc
+ 
+ #>+ 3
+-SensorLogger.moc: $(srcdir)/SensorLogger.h
+-	$(MOC) $(srcdir)/SensorLogger.h -o SensorLogger.moc
++ReniceDlg.moc: $(srcdir)/ReniceDlg.h
++	$(MOC) $(srcdir)/ReniceDlg.h -o ReniceDlg.moc
+ 
+ #>+ 2
+-mocs: SensorLogger.moc
++mocs: ReniceDlg.moc
+ 
+ #>+ 3
+ DancingBarsSettings.moc: $(srcdir)/DancingBarsSettings.h
+@@ -1068,7 +1071,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc ReniceDlg.moc SensorLogger.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
++	-rm -f  SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
+ 
+ #>+ 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 
+@@ -1128,7 +1131,7 @@
+ 
+ 
+ #>+ 11
+-libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc  ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc ReniceDlg.moc SensorLogger.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
++libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc  ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
+ 	@echo 'creating libsensordisplays_la.all_cc.cc ...'; \
+ 	rm -f libsensordisplays_la.all_cc.files libsensordisplays_la.all_cc.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libsensordisplays_la.all_cc.final; \
+diff -Nrua kdebase-3.4.0.orig/ksysguard/gui/ksgrd/Makefile.in kdebase-3.4.0/ksysguard/gui/ksgrd/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/gui/ksgrd/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksysguard/gui/ksgrd/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libksgrd_la_SOURCES)
+ DIST_SOURCES = $(libksgrd_la_SOURCES)
+@@ -287,6 +287,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@
+@@ -610,7 +613,7 @@
+ 
+ .SUFFIXES:
+ .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*) \
+@@ -648,9 +651,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)
+@@ -953,13 +956,6 @@
+ mocs: SensorSocketAgent.moc
+ 
+ #>+ 3
+-StyleSettings.moc: $(srcdir)/StyleSettings.h
+-	$(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
+-
+-#>+ 2
+-mocs: StyleSettings.moc
+-
+-#>+ 3
+ SensorManager.moc: $(srcdir)/SensorManager.h
+ 	$(MOC) $(srcdir)/SensorManager.h -o SensorManager.moc
+ 
+@@ -967,11 +963,11 @@
+ mocs: SensorManager.moc
+ 
+ #>+ 3
+-StyleEngine.moc: $(srcdir)/StyleEngine.h
+-	$(MOC) $(srcdir)/StyleEngine.h -o StyleEngine.moc
++StyleSettings.moc: $(srcdir)/StyleSettings.h
++	$(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
+ 
+ #>+ 2
+-mocs: StyleEngine.moc
++mocs: StyleSettings.moc
+ 
+ #>+ 3
+ SensorShellAgent.moc: $(srcdir)/SensorShellAgent.h
+@@ -981,6 +977,13 @@
+ mocs: SensorShellAgent.moc
+ 
+ #>+ 3
++StyleEngine.moc: $(srcdir)/StyleEngine.h
++	$(MOC) $(srcdir)/StyleEngine.h -o StyleEngine.moc
++
++#>+ 2
++mocs: StyleEngine.moc
++
++#>+ 3
+ HostConnector.moc: $(srcdir)/HostConnector.h
+ 	$(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
+ 
+@@ -996,7 +999,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.moc
++	-rm -f  TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleSettings.moc SensorShellAgent.moc StyleEngine.moc HostConnector.moc SensorAgent.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in Makefile.am 
+@@ -1047,7 +1050,7 @@
+ 
+ 
+ #>+ 11
+-libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc  TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleSettings.moc SensorShellAgent.moc StyleEngine.moc HostConnector.moc SensorAgent.moc
++libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc  TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.moc
+ 	@echo 'creating libksgrd_la.all_cc.cc ...'; \
+ 	rm -f libksgrd_la.all_cc.files libksgrd_la.all_cc.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libksgrd_la.all_cc.final; \
+diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/FreeBSD/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/FreeBSD/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -73,11 +73,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libksysguardd_a_SOURCES)
+ DIST_SOURCES = $(libksysguardd_a_SOURCES)
+@@ -269,6 +269,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@
+@@ -562,7 +565,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -600,9 +603,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-noinstLIBRARIES:
+diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Irix/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Irix/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Irix/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Irix/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -68,11 +68,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libksysguardd_a_SOURCES)
+ DIST_SOURCES = $(libksysguardd_a_SOURCES)
+@@ -264,6 +264,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@
+@@ -555,7 +558,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -593,9 +596,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-noinstLIBRARIES:
+diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Linux/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Linux/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Linux/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Linux/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -74,11 +74,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libksysguardd_a_SOURCES)
+ DIST_SOURCES = $(libksysguardd_a_SOURCES)
+@@ -270,6 +270,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@
+@@ -568,7 +571,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -606,9 +609,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-noinstLIBRARIES:
+diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -72,11 +72,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ksysguardd_SOURCES)
+ DIST_SOURCES = $(ksysguardd_SOURCES)
+@@ -282,6 +282,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@
+@@ -586,7 +589,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -624,9 +627,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -709,7 +712,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -721,7 +730,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -729,7 +738,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -750,7 +765,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/NetBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/NetBSD/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/ksysguardd/NetBSD/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/NetBSD/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -73,11 +73,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libksysguardd_a_SOURCES)
+ DIST_SOURCES = $(libksysguardd_a_SOURCES)
+@@ -269,6 +269,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@
+@@ -562,7 +565,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -600,9 +603,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-noinstLIBRARIES:
+diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/OpenBSD/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/OpenBSD/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -66,11 +66,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libksysguardd_a_SOURCES)
+ DIST_SOURCES = $(libksysguardd_a_SOURCES)
+@@ -262,6 +262,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@
+@@ -554,7 +557,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -592,9 +595,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-noinstLIBRARIES:
+diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Solaris/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Solaris/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Solaris/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Solaris/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -74,11 +74,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libksysguardd_a_SOURCES)
+ DIST_SOURCES = $(libksysguardd_a_SOURCES)
+@@ -270,6 +270,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@
+@@ -561,7 +564,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -599,9 +602,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-noinstLIBRARIES:
+diff -Nrua kdebase-3.4.0.orig/ksysguard/ksysguardd/Tru64/Makefile.in kdebase-3.4.0/ksysguard/ksysguardd/Tru64/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/ksysguardd/Tru64/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksysguard/ksysguardd/Tru64/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,11 +76,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libksysguardd_a_SOURCES)
+ DIST_SOURCES = $(libksysguardd_a_SOURCES)
+@@ -272,6 +272,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@
+@@ -567,7 +570,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -605,9 +608,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-libLIBRARIES: $(lib_LIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/ksysguard/pics/Makefile.in kdebase-3.4.0/ksysguard/pics/Makefile.in
+--- kdebase-3.4.0.orig/ksysguard/pics/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksysguard/pics/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -538,7 +541,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*) \
+@@ -576,9 +579,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:
+diff -Nrua kdebase-3.4.0.orig/ksystraycmd/Makefile.in kdebase-3.4.0/ksystraycmd/Makefile.in
+--- kdebase-3.4.0.orig/ksystraycmd/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ksystraycmd/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ksystraycmd_SOURCES)
+ DIST_SOURCES = $(ksystraycmd_SOURCES)
+@@ -280,6 +280,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
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/ktip/Makefile.in kdebase-3.4.0/ktip/Makefile.in
+--- kdebase-3.4.0.orig/ktip/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ktip/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -70,18 +70,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ktip_SOURCES)
+ DIST_SOURCES = $(ktip_SOURCES)
+@@ -297,6 +297,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@
+@@ -597,7 +600,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*) \
+@@ -635,9 +638,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -768,7 +771,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -780,7 +789,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -788,7 +797,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -809,7 +824,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1060,24 +1075,24 @@
+ install-kde-icons:
+ 	$(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/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-ktip.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktip.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktip.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktip.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/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
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/ktip/pics/Makefile.in kdebase-3.4.0/ktip/pics/Makefile.in
+--- kdebase-3.4.0.orig/ktip/pics/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/ktip/pics/Makefile.in	2005-03-04 19:44:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/kwin/Makefile.in kdebase-3.4.0/kwin/Makefile.in
+--- kdebase-3.4.0.orig/kwin/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/kwin/Makefile.in	2005-03-04 19:44:47.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -96,18 +96,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin_la_SOURCES)
+ #>- DIST_SOURCES = $(kwin_la_SOURCES)
+@@ -321,6 +321,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@
+@@ -641,7 +644,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -679,9 +682,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)
+@@ -887,7 +890,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -899,7 +908,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -907,7 +916,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -928,7 +943,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1430,22 +1445,22 @@
+ mocs: geometrytip.moc
+ 
+ #>+ 3
+-sm.moc: $(srcdir)/sm.h
+-	$(MOC) $(srcdir)/sm.h -o sm.moc
++main.moc: $(srcdir)/main.h
++	$(MOC) $(srcdir)/main.h -o main.moc
+ 
+ #>+ 2
+-mocs: sm.moc
++mocs: main.moc
+ 
+ #>+ 3
+-main.moc: $(srcdir)/main.h
+-	$(MOC) $(srcdir)/main.h -o main.moc
++sm.moc: $(srcdir)/sm.h
++	$(MOC) $(srcdir)/sm.h -o sm.moc
+ 
+ #>+ 2
+-mocs: main.moc
++mocs: sm.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  client.moc workspace.moc tabbox.moc utils.moc popupinfo.moc geometrytip.moc sm.moc main.moc
++	-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 
+@@ -1460,17 +1475,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
+ 
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1511,7 +1526,7 @@
+ 
+ 
+ #>+ 11
+-libkdeinit_kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/client.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/utils.cpp $(srcdir)/layers.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/geometrytip.cpp $(srcdir)/sm.cpp $(srcdir)/group.cpp $(srcdir)/bridge.cpp $(srcdir)/manage.cpp $(srcdir)/notifications.cpp $(srcdir)/activation.cpp $(srcdir)/useractions.cpp $(srcdir)/geometry.cpp $(srcdir)/rules.cpp KWinInterface_skel.cpp  workspace.moc utils.moc main.moc sm.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
++libkdeinit_kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/client.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/utils.cpp $(srcdir)/layers.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/geometrytip.cpp $(srcdir)/sm.cpp $(srcdir)/group.cpp $(srcdir)/bridge.cpp $(srcdir)/manage.cpp $(srcdir)/notifications.cpp $(srcdir)/activation.cpp $(srcdir)/useractions.cpp $(srcdir)/geometry.cpp $(srcdir)/rules.cpp KWinInterface_skel.cpp  workspace.moc utils.moc sm.moc main.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
+ 	@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; \
+@@ -1586,6 +1601,6 @@
+ nmcheck-am: nmcheck
+ popupinfo.o: popupinfo.moc 
+ workspace.o: workspace.moc 
+-workspace.lo: workspace.moc 
+ sm.o: sm.moc 
++workspace.lo: workspace.moc 
+ popupinfo.lo: popupinfo.moc 
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/Makefile.in kdebase-3.4.0/kwin/clients/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/Makefile.in	2005-03-04 19:44:47.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+@@ -599,7 +602,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -611,7 +620,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -619,7 +628,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -640,7 +655,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/b2/Makefile.in kdebase-3.4.0/kwin/clients/b2/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/b2/Makefile.in	2005-03-04 08:15:06.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/b2/Makefile.in	2005-03-04 19:44:47.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin3_b2_la_SOURCES)
+ DIST_SOURCES = $(kwin3_b2_la_SOURCES)
+@@ -295,6 +295,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@
+@@ -595,7 +598,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*) \
+@@ -633,9 +636,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)
+@@ -733,7 +736,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -745,7 +754,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -753,7 +762,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -774,7 +789,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/b2/config/Makefile.in kdebase-3.4.0/kwin/clients/b2/config/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/b2/config/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/b2/config/Makefile.in	2005-03-04 19:44:47.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin_b2_config_la_SOURCES)
+ DIST_SOURCES = $(kwin_b2_config_la_SOURCES)
+@@ -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@
+@@ -575,7 +578,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*) \
+@@ -613,9 +616,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)
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/default/Makefile.in kdebase-3.4.0/kwin/clients/default/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/default/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/default/Makefile.in	2005-03-04 19:44:47.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin3_default_la_SOURCES)
+ DIST_SOURCES = $(kwin3_default_la_SOURCES)
+@@ -294,6 +294,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@
+@@ -590,7 +593,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*) \
+@@ -628,9 +631,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)
+@@ -711,7 +714,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -723,7 +732,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -731,7 +740,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -752,7 +767,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/default/config/Makefile.in kdebase-3.4.0/kwin/clients/default/config/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/default/config/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/default/config/Makefile.in	2005-03-04 19:44:48.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin_default_config_la_SOURCES)
+ DIST_SOURCES = $(kwin_default_config_la_SOURCES)
+@@ -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@
+@@ -575,7 +578,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*) \
+@@ -613,9 +616,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)
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/keramik/Makefile.in kdebase-3.4.0/kwin/clients/keramik/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/keramik/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/keramik/Makefile.in	2005-03-04 19:44:48.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -85,18 +85,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin3_keramik_la_SOURCES) $(embedtool_SOURCES)
+ DIST_SOURCES = $(kwin3_keramik_la_SOURCES) $(embedtool_SOURCES)
+@@ -305,6 +305,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@
+@@ -610,7 +613,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*) \
+@@ -648,9 +651,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)
+@@ -759,7 +762,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -771,7 +780,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -779,7 +788,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -800,7 +815,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/keramik/config/Makefile.in kdebase-3.4.0/kwin/clients/keramik/config/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/keramik/config/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/keramik/config/Makefile.in	2005-03-04 19:44:48.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin_keramik_config_la_SOURCES)
+ DIST_SOURCES = $(kwin_keramik_config_la_SOURCES)
+@@ -282,6 +282,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@
+@@ -580,7 +583,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*) \
+@@ -618,9 +621,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)
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/kwmtheme/Makefile.in kdebase-3.4.0/kwin/clients/kwmtheme/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/kwmtheme/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/kwmtheme/Makefile.in	2005-03-04 19:44:48.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin3_kwmtheme_la_SOURCES)
+ DIST_SOURCES = $(kwin3_kwmtheme_la_SOURCES)
+@@ -295,6 +295,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@
+@@ -593,7 +596,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*) \
+@@ -631,9 +634,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)
+@@ -731,7 +734,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -743,7 +752,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -751,7 +760,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -772,7 +787,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in kdebase-3.4.0/kwin/clients/kwmtheme/cli_installer/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/kwmtheme/cli_installer/Makefile.in	2005-03-04 19:44:48.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -68,18 +68,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwmtheme_SOURCES)
+ DIST_SOURCES = $(kwmtheme_SOURCES)
+@@ -271,6 +271,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@
+@@ -572,7 +575,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*) \
+@@ -610,9 +613,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/laptop/Makefile.in kdebase-3.4.0/kwin/clients/laptop/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/laptop/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/laptop/Makefile.in	2005-03-04 19:44:48.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin3_laptop_la_SOURCES)
+ DIST_SOURCES = $(kwin3_laptop_la_SOURCES)
+@@ -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@
+@@ -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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/modernsystem/Makefile.in kdebase-3.4.0/kwin/clients/modernsystem/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/modernsystem/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/modernsystem/Makefile.in	2005-03-04 19:44:48.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin3_modernsys_la_SOURCES)
+ DIST_SOURCES = $(kwin3_modernsys_la_SOURCES)
+@@ -295,6 +295,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@
+@@ -594,7 +597,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*) \
+@@ -632,9 +635,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)
+@@ -732,7 +735,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -744,7 +753,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -752,7 +761,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -773,7 +788,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/modernsystem/config/Makefile.in kdebase-3.4.0/kwin/clients/modernsystem/config/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/modernsystem/config/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/modernsystem/config/Makefile.in	2005-03-04 19:44:48.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin_modernsys_config_la_SOURCES)
+ DIST_SOURCES = $(kwin_modernsys_config_la_SOURCES)
+@@ -280,6 +280,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@
+@@ -576,7 +579,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*) \
+@@ -614,9 +617,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)
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/plastik/Makefile.in kdebase-3.4.0/kwin/clients/plastik/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/plastik/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/plastik/Makefile.in	2005-03-04 19:44:49.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin3_plastik_la_SOURCES)
+ DIST_SOURCES = $(kwin3_plastik_la_SOURCES)
+@@ -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@
+@@ -599,7 +602,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*) \
+@@ -637,9 +640,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)
+@@ -741,7 +744,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -753,7 +762,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -761,7 +770,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -782,7 +797,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/plastik/config/Makefile.in kdebase-3.4.0/kwin/clients/plastik/config/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/plastik/config/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/plastik/config/Makefile.in	2005-03-04 19:44:49.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -78,18 +78,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin_plastik_config_la_SOURCES)
+ DIST_SOURCES = $(kwin_plastik_config_la_SOURCES)
+@@ -282,6 +282,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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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)
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/quartz/Makefile.in kdebase-3.4.0/kwin/clients/quartz/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/quartz/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/quartz/Makefile.in	2005-03-04 19:44:49.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin3_quartz_la_SOURCES)
+ DIST_SOURCES = $(kwin3_quartz_la_SOURCES)
+@@ -297,6 +297,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@
+@@ -596,7 +599,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*) \
+@@ -634,9 +637,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)
+@@ -734,7 +737,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -746,7 +755,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -754,7 +763,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -775,7 +790,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/quartz/config/Makefile.in kdebase-3.4.0/kwin/clients/quartz/config/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/quartz/config/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/quartz/config/Makefile.in	2005-03-04 19:44:49.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -75,18 +75,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin_quartz_config_la_SOURCES)
+ DIST_SOURCES = $(kwin_quartz_config_la_SOURCES)
+@@ -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@
+@@ -575,7 +578,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*) \
+@@ -613,9 +616,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)
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/redmond/Makefile.in kdebase-3.4.0/kwin/clients/redmond/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/redmond/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/redmond/Makefile.in	2005-03-04 19:44:49.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin3_redmond_la_SOURCES)
+ DIST_SOURCES = $(kwin3_redmond_la_SOURCES)
+@@ -283,6 +283,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@
+@@ -581,7 +584,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*) \
+@@ -619,9 +622,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)
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/test/Makefile.in kdebase-3.4.0/kwin/clients/test/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/test/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/test/Makefile.in	2005-03-04 19:44:50.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin3_test_la_SOURCES)
+ DIST_SOURCES = $(kwin3_test_la_SOURCES)
+@@ -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@
+@@ -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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kwin/clients/web/Makefile.in kdebase-3.4.0/kwin/clients/web/Makefile.in
+--- kdebase-3.4.0.orig/kwin/clients/web/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/clients/web/Makefile.in	2005-03-04 19:44:51.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -84,18 +84,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin3_web_la_SOURCES)
+ DIST_SOURCES = $(kwin3_web_la_SOURCES)
+@@ -290,6 +290,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@
+@@ -606,7 +609,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*) \
+@@ -644,9 +647,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)
+@@ -946,27 +949,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
+-WebButton.moc: $(srcdir)/WebButton.h
+-	$(MOC) $(srcdir)/WebButton.h -o WebButton.moc
+-
+-#>+ 2
+-mocs: WebButton.moc
+-
+-#>+ 3
+ Web.moc: $(srcdir)/Web.h
+ 	$(MOC) $(srcdir)/Web.h -o Web.moc
+ 
+@@ -995,8 +977,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 WebButton.moc Web.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 
+@@ -1047,7 +1050,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 Web.moc WebButton.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; \
+@@ -1091,8 +1094,8 @@
+ WebButtonLower.lo: WebButtonLower.moc 
+ WebButtonMaximize.lo: WebButtonMaximize.moc 
+ WebButtonLower.o: WebButtonLower.moc 
+-WebButtonIconify.o: WebButtonIconify.moc 
+ WebButton.lo: WebButton.moc 
++WebButtonIconify.o: WebButtonIconify.moc 
+ WebButtonSticky.lo: WebButtonSticky.moc 
+ WebButtonHelp.lo: WebButtonHelp.moc 
+ nmcheck: 
+diff -Nrua kdebase-3.4.0.orig/kwin/data/Makefile.in kdebase-3.4.0/kwin/data/Makefile.in
+--- kdebase-3.4.0.orig/kwin/data/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/data/Makefile.in	2005-03-04 19:44:51.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -76,18 +76,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin_update_window_settings_SOURCES)
+ DIST_SOURCES = $(kwin_update_window_settings_SOURCES)
+@@ -288,6 +288,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@
+@@ -589,7 +592,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*) \
+@@ -627,9 +630,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-kconfPROGRAMS: $(kconf_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/Makefile.in kdebase-3.4.0/kwin/kcmkwin/Makefile.in
+--- kdebase-3.4.0.orig/kwin/kcmkwin/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/Makefile.in	2005-03-04 19:44:51.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+@@ -599,7 +602,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -611,7 +620,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -619,7 +628,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -640,7 +655,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/kwindecoration/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwindecoration/Makefile.in
+--- kdebase-3.4.0.orig/kwin/kcmkwin/kwindecoration/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/kwindecoration/Makefile.in	2005-03-04 19:44:51.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -83,18 +83,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_kwindecoration_la_SOURCES)
+ DIST_SOURCES = $(kcm_kwindecoration_la_SOURCES)
+@@ -289,6 +289,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@
+@@ -592,7 +595,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*) \
+@@ -630,9 +633,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)
+diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/kwinoptions/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwinoptions/Makefile.in
+--- kdebase-3.4.0.orig/kwin/kcmkwin/kwinoptions/Makefile.in	2005-03-04 08:15:07.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/kwinoptions/Makefile.in	2005-03-04 19:44:52.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -81,18 +81,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_kwinoptions_la_SOURCES)
+ DIST_SOURCES = $(kcm_kwinoptions_la_SOURCES)
+@@ -288,6 +288,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@
+@@ -588,7 +591,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*) \
+@@ -626,9 +629,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)
+diff -Nrua kdebase-3.4.0.orig/kwin/kcmkwin/kwinrules/Makefile.in kdebase-3.4.0/kwin/kcmkwin/kwinrules/Makefile.in
+--- kdebase-3.4.0.orig/kwin/kcmkwin/kwinrules/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/kwin/kcmkwin/kwinrules/Makefile.in	2005-03-04 19:44:52.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -107,18 +107,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_kwinrules_la_SOURCES) $(kwin_rules_dialog_la_SOURCES) \
+ 	$(libkwinrules_la_SOURCES)
+@@ -317,6 +317,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@
+@@ -639,7 +642,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*) \
+@@ -677,9 +680,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)
+diff -Nrua kdebase-3.4.0.orig/kwin/killer/Makefile.in kdebase-3.4.0/kwin/killer/Makefile.in
+--- kdebase-3.4.0.orig/kwin/killer/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/kwin/killer/Makefile.in	2005-03-04 19:44:52.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -68,18 +68,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwin_killer_helper_SOURCES)
+ DIST_SOURCES = $(kwin_killer_helper_SOURCES)
+@@ -271,6 +271,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@
+@@ -564,7 +567,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*) \
+@@ -602,9 +605,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kwin/kompmgr/Makefile.in kdebase-3.4.0/kwin/kompmgr/Makefile.in
+--- kdebase-3.4.0.orig/kwin/kompmgr/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/kwin/kompmgr/Makefile.in	2005-03-04 19:44:52.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -66,11 +66,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kompmgr_SOURCES)
+ DIST_SOURCES = $(kompmgr_SOURCES)
+@@ -262,6 +262,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@
+@@ -553,7 +556,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -591,9 +594,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/kwin/lib/Makefile.in kdebase-3.4.0/kwin/lib/Makefile.in
+--- kdebase-3.4.0.orig/kwin/lib/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/kwin/lib/Makefile.in	2005-03-04 19:44:53.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -80,18 +80,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkdecorations_la_SOURCES)
+ DIST_SOURCES = $(libkdecorations_la_SOURCES)
+@@ -285,6 +285,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@
+@@ -590,7 +593,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -628,9 +631,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)
+diff -Nrua kdebase-3.4.0.orig/kwin/oldheaders/Makefile.in kdebase-3.4.0/kwin/oldheaders/Makefile.in
+--- kdebase-3.4.0.orig/kwin/oldheaders/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/kwin/oldheaders/Makefile.in	2005-03-04 19:44:53.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -248,6 +248,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@
+@@ -537,7 +540,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*) \
+@@ -575,9 +578,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:
+diff -Nrua kdebase-3.4.0.orig/kwin/pics/Makefile.in kdebase-3.4.0/kwin/pics/Makefile.in
+--- kdebase-3.4.0.orig/kwin/pics/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/kwin/pics/Makefile.in	2005-03-04 19:44:53.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -538,7 +541,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*) \
+@@ -576,9 +579,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:
+diff -Nrua kdebase-3.4.0.orig/kwin/tools/Makefile.in kdebase-3.4.0/kwin/tools/Makefile.in
+--- kdebase-3.4.0.orig/kwin/tools/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/kwin/tools/Makefile.in	2005-03-04 19:44:53.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -66,18 +66,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(test_gravity_SOURCES)
+ DIST_SOURCES = $(test_gravity_SOURCES)
+@@ -269,6 +269,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@
+@@ -562,7 +565,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*) \
+@@ -600,9 +603,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:
+diff -Nrua kdebase-3.4.0.orig/kxkb/Makefile.in kdebase-3.4.0/kxkb/Makefile.in
+--- kdebase-3.4.0.orig/kxkb/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/kxkb/Makefile.in	2005-03-04 19:44:53.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -101,18 +101,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES)
+ #>- DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES)
+@@ -323,6 +323,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@
+@@ -622,7 +625,7 @@
+ #>- kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ #>+ 1
+ kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
+-kcm_keyboard_la_LIBADD = -lxkbfile $(XTESTLIB) $(LIB_KIO)
++kcm_keyboard_la_LIBADD = -lxkbfile_pic $(XTESTLIB) $(LIB_KIO)
+ 
+ #kxkb_la_includedir = .
+ #kxkb_la_include_HEADERS = kxkb.h
+@@ -631,7 +634,7 @@
+ kxkb_la_SOURCES = kxkb_la_dummy.cpp
+ libkdeinit_kxkb_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp  kxkb_skel.cpp
+ kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-#>- kxkb_la_LIBADD = -lxkbfile -lX11 -lXext $(LIB_KDEUI)
++#>- kxkb_la_LIBADD = -lxkbfile_pic -lX11 -lXext $(LIB_KDEUI)
+ #>+ 1
+ kxkb_la_LIBADD = libkdeinit_kxkb.la
+ xdg_apps_DATA = keyboard.desktop keyboard_layout.desktop
+@@ -643,7 +646,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*) \
+@@ -681,9 +684,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)
+@@ -887,7 +890,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -899,7 +908,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -907,7 +916,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -928,7 +943,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1185,7 +1200,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-libkdeinit_kxkb_la_LIBADD = -lxkbfile -lX11 -lXext $(LIB_KDEUI)
++libkdeinit_kxkb_la_LIBADD = -lxkbfile_pic -lX11 -lXext $(LIB_KDEUI)
+ 
+ #>+ 2
+ libkdeinit_kxkb_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries)
+diff -Nrua kdebase-3.4.0.orig/kxkb/pics/Makefile.in kdebase-3.4.0/kxkb/pics/Makefile.in
+--- kdebase-3.4.0.orig/kxkb/pics/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/kxkb/pics/Makefile.in	2005-03-04 19:44:53.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -523,7 +526,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*) \
+@@ -561,9 +564,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:
+@@ -713,17 +716,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
++	$(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)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kxkb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kxkb.png
+ 
+ uninstall-kde-icons:
++	-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)/crystalsvg/48x48/apps/kxkb.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/l10n/Makefile.in kdebase-3.4.0/l10n/Makefile.in
+--- kdebase-3.4.0.orig/l10n/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/l10n/Makefile.in	2005-03-04 19:44:53.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -246,6 +246,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
+ 
+ mostlyclean-libtool:
+diff -Nrua kdebase-3.4.0.orig/libkonq/Makefile.in kdebase-3.4.0/libkonq/Makefile.in
+--- kdebase-3.4.0.orig/libkonq/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/libkonq/Makefile.in	2005-03-04 19:44:57.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -119,18 +119,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(konq_sound_la_SOURCES) $(libkonq_la_SOURCES)
+ DIST_SOURCES = $(konq_sound_la_SOURCES) $(libkonq_la_SOURCES)
+@@ -341,6 +341,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@
+@@ -679,7 +682,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -717,9 +720,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)
+@@ -902,7 +905,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -914,7 +923,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -922,7 +931,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -943,7 +958,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1372,18 +1387,18 @@
+ 
+ 
+ #>+ 3
+-konq_historymgr.moc: $(srcdir)/konq_historymgr.h
+-	$(MOC) $(srcdir)/konq_historymgr.h -o konq_historymgr.moc
++konq_filetip.moc: $(srcdir)/konq_filetip.h
++	$(MOC) $(srcdir)/konq_filetip.h -o konq_filetip.moc
+ 
+ #>+ 2
+-mocs: konq_historymgr.moc
++mocs: konq_filetip.moc
+ 
+ #>+ 3
+-konq_filetip.moc: $(srcdir)/konq_filetip.h
+-	$(MOC) $(srcdir)/konq_filetip.h -o konq_filetip.moc
++konq_historymgr.moc: $(srcdir)/konq_historymgr.h
++	$(MOC) $(srcdir)/konq_historymgr.h -o konq_historymgr.moc
+ 
+ #>+ 2
+-mocs: konq_filetip.moc
++mocs: konq_historymgr.moc
+ 
+ #>+ 3
+ konq_iconviewwidget.moc: $(srcdir)/konq_iconviewwidget.h
+@@ -1414,18 +1429,18 @@
+ mocs: knewmenu.moc
+ 
+ #>+ 3
+-konq_operations.moc: $(srcdir)/konq_operations.h
+-	$(MOC) $(srcdir)/konq_operations.h -o konq_operations.moc
++kivdirectoryoverlay.moc: $(srcdir)/kivdirectoryoverlay.h
++	$(MOC) $(srcdir)/kivdirectoryoverlay.h -o kivdirectoryoverlay.moc
+ 
+ #>+ 2
+-mocs: konq_operations.moc
++mocs: kivdirectoryoverlay.moc
+ 
+ #>+ 3
+-kivdirectoryoverlay.moc: $(srcdir)/kivdirectoryoverlay.h
+-	$(MOC) $(srcdir)/kivdirectoryoverlay.h -o kivdirectoryoverlay.moc
++konq_operations.moc: $(srcdir)/konq_operations.h
++	$(MOC) $(srcdir)/konq_operations.h -o konq_operations.moc
+ 
+ #>+ 2
+-mocs: kivdirectoryoverlay.moc
++mocs: konq_operations.moc
+ 
+ #>+ 3
+ konq_faviconmgr.moc: $(srcdir)/konq_faviconmgr.h
+@@ -1480,7 +1495,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc konq_operations.moc kivdirectoryoverlay.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
++	-rm -f  konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
+ 
+ #>+ 2
+ KDE_DIST=SERVICEMENUS DESIGN Makefile.in konq_bgnddlg.h directory_bookmarkbar.desktop konqpopupmenuplugin.desktop PLUGINS Makefile.am 
+@@ -1538,7 +1553,7 @@
+ 
+ 
+ #>+ 11
+-libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc  konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc konq_operations.moc kivdirectoryoverlay.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
++libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc  konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
+ 	@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; \
+@@ -1583,8 +1598,8 @@
+ konq_bgnddlg.o: konq_bgnddlg.moc 
+ konq_bgnddlg.lo: konq_bgnddlg.moc 
+ konq_faviconmgr.lo: konq_faviconmgr.moc 
+-kivdirectoryoverlay.o: kivdirectoryoverlay.moc 
+ konq_operations.o: konq_operations.moc 
++kivdirectoryoverlay.o: kivdirectoryoverlay.moc 
+ konq_filetip.lo: konq_filetip.moc 
+ konq_drag.lo: konq_drag.moc 
+ konq_popupmenu.o: konq_popupmenu.moc 
+diff -Nrua kdebase-3.4.0.orig/libkonq/favicons/Makefile.in kdebase-3.4.0/libkonq/favicons/Makefile.in
+--- kdebase-3.4.0.orig/libkonq/favicons/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/libkonq/favicons/Makefile.in	2005-03-04 19:44:57.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -82,18 +82,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_favicons_la_SOURCES)
+ DIST_SOURCES = $(kded_favicons_la_SOURCES)
+@@ -288,6 +288,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@
+@@ -589,7 +592,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*) \
+@@ -627,9 +630,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)
+diff -Nrua kdebase-3.4.0.orig/libkonq/pics/Makefile.in kdebase-3.4.0/libkonq/pics/Makefile.in
+--- kdebase-3.4.0.orig/libkonq/pics/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/libkonq/pics/Makefile.in	2005-03-04 19:44:57.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -534,7 +537,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*) \
+@@ -572,9 +575,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:
+diff -Nrua kdebase-3.4.0.orig/nsplugins/Makefile.in kdebase-3.4.0/nsplugins/Makefile.in
+--- kdebase-3.4.0.orig/nsplugins/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/nsplugins/Makefile.in	2005-03-04 19:44:57.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -95,18 +95,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_nsplugins_la_SOURCES) $(libnsplugin_la_SOURCES) \
+ 	$(nspluginscan_SOURCES)
+@@ -318,6 +318,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@
+@@ -635,7 +638,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*) \
+@@ -673,9 +676,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)
+@@ -829,7 +832,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -841,7 +850,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -849,7 +858,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -870,7 +885,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/nsplugins/test/Makefile.in kdebase-3.4.0/nsplugins/test/Makefile.in
+--- kdebase-3.4.0.orig/nsplugins/test/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/nsplugins/test/Makefile.in	2005-03-04 19:44:57.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -66,18 +66,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(testnsplugin_SOURCES)
+ DIST_SOURCES = $(testnsplugin_SOURCES)
+@@ -270,6 +270,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@
+@@ -564,7 +567,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*) \
+@@ -602,9 +605,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:
+diff -Nrua kdebase-3.4.0.orig/nsplugins/viewer/Makefile.in kdebase-3.4.0/nsplugins/viewer/Makefile.in
+--- kdebase-3.4.0.orig/nsplugins/viewer/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/nsplugins/viewer/Makefile.in	2005-03-04 19:44:57.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -74,18 +74,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(nspluginviewer_SOURCES)
+ DIST_SOURCES = $(nspluginviewer_SOURCES)
+@@ -277,6 +277,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@
+@@ -576,7 +579,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*) \
+@@ -614,9 +617,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-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdebase-3.4.0.orig/nsplugins/wrapper/Makefile.in kdebase-3.4.0/nsplugins/wrapper/Makefile.in
+--- kdebase-3.4.0.orig/nsplugins/wrapper/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/nsplugins/wrapper/Makefile.in	2005-03-04 19:44:57.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -69,11 +69,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libnswrapper_la_SOURCES)
+ DIST_SOURCES = $(libnswrapper_la_SOURCES)
+@@ -265,6 +265,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@
+@@ -556,7 +559,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -594,9 +597,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)
+diff -Nrua kdebase-3.4.0.orig/pics/Makefile.in kdebase-3.4.0/pics/Makefile.in
+--- kdebase-3.4.0.orig/pics/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/pics/Makefile.in	2005-03-04 19:44:57.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -251,6 +251,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@
+@@ -539,7 +542,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*) \
+@@ -577,9 +580,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:
+@@ -599,7 +602,13 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -611,7 +620,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -619,7 +628,13 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -640,7 +655,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdebase-3.4.0.orig/pics/crystalsvg/Makefile.in kdebase-3.4.0/pics/crystalsvg/Makefile.in
+--- kdebase-3.4.0.orig/pics/crystalsvg/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/pics/crystalsvg/Makefile.in	2005-03-04 19:44:58.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -523,7 +526,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*) \
+@@ -561,9 +564,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:
+@@ -706,786 +709,786 @@
+ .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 cr48-app-xv.png cr32-app-xmag.png cr16-app-applixware.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-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_development.png cr128-app-package_utilities.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 cr64-app-package_multimedia.png cr48-app-galeon.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr64-app-phppg.png cr32-app-blender.png cr48-app-clanbomber.png cr32-app-xedit.png cr16-app-sodipodi.png cr32-app-xclipboard.png crsc-app-openoffice.svgz crsc-app-aktion.svgz cr32-app-package_multimedia.png cr16-app-licq.png cr128-app-pysol.png 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 crsc-app-xchat.svgz cr48-app-xclock.png 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 cr32-app-eclipse.png cr16-app-designer.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 cr64-app-applixware.png cr48-app-xfmail.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-wine.png cr32-app-package_games.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 cr64-app-penguin.png cr48-app-package_games_board.png cr32-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_games.png cr16-app-package_application.png cr48-app-staroffice.png cr16-app-phppg.png crsc-app-xcalc.svgz cr48-app-gnucash.png 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 crsc-app-core.svgz cr48-app-evolution.png crsc-app-display.svgz cr64-app-terminal.png cr32-app-x.png cr16-app-dia.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 cr64-app-gimp.png cr48-app-xemacs.png cr48-app-pan.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-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 cr48-app-planner.png cr128-app-applixware.png cr48-app-vnc.png cr128-app-staroffice.png crsc-app-gnome_apps.svgz cr32-app-xcalc.png 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 crsc-app-clock.svgz cr16-app-gabber.png 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-wabi.png cr16-app-linuxconf.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr32-app-vnc.png cr16-app-lyx.png cr48-app-eclipse.png cr128-app-acroread.png cr48-app-edu_languages.png cr32-app-xv.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 cr48-app-abiword.png cr16-app-nedit.png cr32-app-linuxconf.png cr32-app-gabber.png cr16-app-xv.png cr16-app-gnomemeeting.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 cr32-app-xclock.png cr16-app-vnc.png cr16-app-package_network.png cr16-app-kfm_home.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 cr16-app-gaim.png cr128-app-xmag.png cr128-app-penguin.png cr32-app-package_games_card.png cr48-app-package_edutainment.png cr48-app-package_development.png crsc-app-applixware.svgz 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 cr64-app-xclock.png cr32-app-package_applications.png cr64-app-mozilla.png cr32-app-alevt.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 cr32-app-nedit.png cr16-app-planner.png cr128-app-netscape.png cr16-app-package.png cr32-app-package_graphics.png cr32-app-kvirc.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 cr32-app-xconsole.png cr128-app-package_favourite.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 crsc-app-download_manager.svgz cr32-app-wp.png 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 cr48-app-package_editors.png cr16-app-firefox.png cr128-app-package_settings.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 crsc-app-acroread.svgz cr48-app-package_wordprocessing.png cr32-app-gvim.png cr32-app-netscape.png cr32-app-dia.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-netscape.png cr64-app-clanbomber.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-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 
+ 
+ #>+ 2
+ docs-am:
+ 
+ #>+ 775
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++	$(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
++	$(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
++	$(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-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
++	$(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
++	$(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/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.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)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
++	$(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)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.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
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
+ 	$(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-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
+-	$(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)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.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)/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
++	$(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-package_toys.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
++	$(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-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
++	$(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
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.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)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.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
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
++	$(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
++	$(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
++	$(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
++	$(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)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++	$(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)/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-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.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)/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
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
++	$(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)/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
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
++	$(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)/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)/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-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-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.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)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.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)/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
++	$(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
++	$(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)/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)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.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)/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)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
++	$(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
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
++	$(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-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)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.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)/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
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
++	$(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)/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)/crsc-app-package_development.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.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)/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
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
++	$(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)/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)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.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)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-package_toys.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-shell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.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)/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)/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
++	$(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
++	$(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)/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)/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)/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)/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)/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)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.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)/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)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.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)/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
++	$(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xchat.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.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
++	$(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
++	$(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)/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
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.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-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/128x128/apps/acroread.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
++	-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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
++	-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/32x32/apps/penguin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
++	-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/128x128/apps/package_games.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
++	-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/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/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/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
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
++	-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/32x32/apps/xfmail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.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/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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
++	-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/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/48x48/apps/acroread.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.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/32x32/apps/scribus.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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
++	-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/32x32/apps/xedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
++	-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/scalable/apps/shell.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
++	-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/32x32/apps/firefox.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.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/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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
++	-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/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
++	-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/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/scalable/apps/xapp.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
++	-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/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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
++	-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/32x32/apps/gnome_apps.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
++	-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/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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
++	-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/48x48/apps/gvim.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/edu_languages.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
++	-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/scalable/apps/email.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
++	-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/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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
++	-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/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
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.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/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nrua kdebase-3.4.0.orig/pics/hicolor/Makefile.in kdebase-3.4.0/pics/hicolor/Makefile.in
+--- kdebase-3.4.0.orig/pics/hicolor/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/pics/hicolor/Makefile.in	2005-03-04 19:44:58.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -235,6 +235,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@
+@@ -523,7 +526,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*) \
+@@ -561,9 +564,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:
+diff -Nrua kdebase-3.4.0.orig/pics/wallpapers/Makefile.in kdebase-3.4.0/pics/wallpapers/Makefile.in
+--- kdebase-3.4.0.orig/pics/wallpapers/Makefile.in	2005-03-04 08:15:08.000000000 -0500
++++ kdebase-3.4.0/pics/wallpapers/Makefile.in	2005-03-04 19:44:58.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in 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.
+@@ -245,6 +245,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@
+@@ -600,7 +603,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*) \
+@@ -638,9 +641,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:
+@@ -800,7 +803,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 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 
++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: