[Pkg-kde-commits] rev 1979 - branches/kde-3.4.0/packages/kdegraphics/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sun Oct 16 17:54:23 UTC 2005


Author: chrsmrtn
Date: 2005-10-16 17:54:21 +0000 (Sun, 16 Oct 2005)
New Revision: 1979

Removed:
   branches/kde-3.4.0/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r454549.diff
Modified:
   branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff
Log:
buildprep update for kdegraphics 3.4.3


Deleted: branches/kde-3.4.0/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r454549.diff

Modified: branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff	2005-10-16 17:43:18 UTC (rev 1978)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/patches/98_buildprep.diff	2005-10-16 17:54:21 UTC (rev 1979)
@@ -1,65 +1,5 @@
 #DPATCHLEVEL=0
 # vi: ft=diff
---- Makefile.in
-+++ Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -230,6 +230,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
- .SUFFIXES:
- am--refresh:
- 	@:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -472,12 +475,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
-@@ -489,7 +492,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 $@
-@@ -912,7 +915,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdegraphics.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
- 
- #>+ 2
- docs-am:
 --- acinclude.m4
 +++ acinclude.m4
 @@ -1688,15 +1688,6 @@
@@ -161,7 +101,7 @@
    fi
  ])
  
-@@ -5799,6 +5787,7 @@
+@@ -5795,6 +5783,7 @@
  ## the same distribution terms that you use for the rest of that program.
  
  # serial 47 AC_PROG_LIBTOOL
@@ -169,7 +109,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5858,7 +5847,7 @@
+@@ -5854,7 +5843,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -178,7 +118,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6272,12 +6261,11 @@
+@@ -6268,12 +6257,11 @@
    if AC_TRY_EVAL(ac_compile); then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
@@ -192,7 +132,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6289,7 +6277,6 @@
+@@ -6285,7 +6273,6 @@
        esac
        ;;
      *64-bit*)
@@ -200,7 +140,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6419,7 +6406,7 @@
+@@ -6415,7 +6402,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -209,7 +149,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6448,20 +6435,26 @@
+@@ -6444,20 +6431,26 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -241,7 +181,7 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -6611,7 +6604,7 @@
+@@ -6607,7 +6600,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -250,7 +190,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6700,13 +6693,6 @@
+@@ -6696,13 +6689,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -264,7 +204,7 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -6730,8 +6716,11 @@
+@@ -6726,8 +6712,11 @@
       fi
     fi
     chmod u+w .
@@ -278,7 +218,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6848,7 +6837,7 @@
+@@ -6844,7 +6833,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -287,7 +227,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -6861,7 +6850,7 @@
+@@ -6857,7 +6846,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -296,7 +236,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -6871,7 +6860,20 @@
+@@ -6867,7 +6856,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -318,7 +258,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -6936,7 +6938,7 @@
+@@ -6932,7 +6934,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -327,7 +267,7 @@
    ;;
  
  beos*)
-@@ -6961,7 +6963,7 @@
+@@ -6957,7 +6959,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -336,7 +276,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7026,7 +7028,7 @@
+@@ -7022,7 +7024,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -345,7 +285,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7049,7 +7051,7 @@
+@@ -7045,7 +7047,7 @@
    dynamic_linker=no
    ;;
  
@@ -354,7 +294,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -7109,7 +7111,7 @@
+@@ -7105,7 +7107,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -363,7 +303,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7124,7 +7126,7 @@
+@@ -7120,7 +7122,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -372,7 +312,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7135,7 +7137,7 @@
+@@ -7131,7 +7133,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -381,7 +321,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7197,22 +7199,19 @@
+@@ -7193,22 +7195,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -410,7 +350,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -7222,6 +7221,30 @@
+@@ -7218,6 +7217,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -441,7 +381,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7231,7 +7254,7 @@
+@@ -7227,7 +7250,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -450,7 +390,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7260,7 +7283,7 @@
+@@ -7256,7 +7279,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -459,7 +399,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -7280,7 +7303,7 @@
+@@ -7276,7 +7299,7 @@
  
  os2*)
    libname_spec='$name'
@@ -468,7 +408,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7871,31 +7894,23 @@
+@@ -7867,31 +7890,23 @@
    ;;
  
  cygwin*)
@@ -509,7 +449,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -7934,42 +7949,21 @@
+@@ -7930,42 +7945,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -559,7 +499,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -7998,9 +7992,6 @@
+@@ -7994,9 +7988,6 @@
    ;;
  
  osf3* | osf4* | osf5*)
@@ -569,7 +509,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -8010,7 +8001,6 @@
+@@ -8006,7 +7997,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -577,7 +517,7 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8276,7 +8266,7 @@
+@@ -8272,7 +8262,7 @@
  fi
  if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
    AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -586,7 +526,7 @@
    else
      AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
      _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8326,7 +8316,7 @@
+@@ -8322,7 +8312,7 @@
    fi
    ;;
  
@@ -595,7 +535,7 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -8336,29 +8326,29 @@
+@@ -8332,29 +8322,29 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case "$host_os" in
      rhapsody* | darwin1.[[012]])
@@ -639,7 +579,7 @@
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8366,8 +8356,8 @@
+@@ -8362,8 +8352,8 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
    else
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -650,7 +590,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8475,8 +8465,8 @@
+@@ -8471,8 +8461,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -661,7 +601,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8502,7 +8492,7 @@
+@@ -8498,7 +8488,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -670,7 +610,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8532,8 +8522,22 @@
+@@ -8528,8 +8518,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -695,7 +635,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8579,15 +8583,16 @@
+@@ -8575,15 +8579,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -716,7 +656,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -8596,13 +8601,12 @@
+@@ -8592,13 +8597,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -732,7 +672,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8617,7 +8621,7 @@
+@@ -8613,7 +8617,7 @@
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
  	# This is similar to how AIX traditionally builds it's shared libraries.
@@ -741,7 +681,7 @@
        fi
      fi
      ;;
-@@ -8634,12 +8638,12 @@
+@@ -8630,12 +8634,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -756,7 +696,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8648,7 +8652,7 @@
+@@ -8644,7 +8648,7 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -765,7 +705,7 @@
      else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
      fi
-@@ -8659,20 +8663,20 @@
+@@ -8655,20 +8659,20 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case "$host_os" in
      rhapsody* | darwin1.[[012]])
@@ -796,7 +736,7 @@
        fi
        ;;
      esac
-@@ -8682,19 +8686,19 @@
+@@ -8678,19 +8682,19 @@
        lt_int_apple_cc_single_mod=yes
      fi
      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -822,7 +762,7 @@
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8729,7 +8733,7 @@
+@@ -8725,7 +8729,7 @@
    freebsd-elf*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
@@ -831,7 +771,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8751,7 +8755,7 @@
+@@ -8747,7 +8751,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
      aCC)
@@ -840,7 +780,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8760,11 +8764,11 @@
+@@ -8756,11 +8760,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
@@ -854,7 +794,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8821,7 +8825,7 @@
+@@ -8817,7 +8821,7 @@
  	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -863,7 +803,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -8842,7 +8846,7 @@
+@@ -8838,7 +8842,7 @@
  	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -872,7 +812,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -8857,7 +8861,7 @@
+@@ -8853,7 +8857,7 @@
      case $cc_basename in
        CC)
  	# SGI C++
@@ -881,7 +821,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -8868,9 +8872,9 @@
+@@ -8864,9 +8868,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -893,7 +833,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8887,8 +8891,8 @@
+@@ -8883,8 +8887,8 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -904,7 +844,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -8910,16 +8914,16 @@
+@@ -8906,16 +8910,16 @@
  	# Intel C++
  	with_gnu_ld=yes
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -925,7 +865,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8957,7 +8961,7 @@
+@@ -8953,7 +8957,7 @@
  	;;
      esac
      ;;
@@ -934,7 +874,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -8976,7 +8980,7 @@
+@@ -8972,7 +8976,7 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -943,7 +883,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8993,7 +8997,7 @@
+@@ -8989,7 +8993,7 @@
  	;;
        cxx)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -952,7 +892,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9011,7 +9015,7 @@
+@@ -9007,7 +9011,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -961,7 +901,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9036,7 +9040,7 @@
+@@ -9032,7 +9036,7 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -970,7 +910,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9052,10 +9056,10 @@
+@@ -9048,10 +9052,10 @@
  	;;
        cxx)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -983,7 +923,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9074,7 +9078,7 @@
+@@ -9070,7 +9074,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -992,7 +932,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9131,9 +9135,9 @@
+@@ -9127,9 +9131,9 @@
        CC)
  	# Sun C++ 4.2, 5.x and Centerline C++
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -1004,7 +944,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9167,7 +9171,7 @@
+@@ -9163,7 +9167,7 @@
  	;;
        gcx)
  	# Green Hills C++ Compiler
@@ -1013,7 +953,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9177,9 +9181,9 @@
+@@ -9173,9 +9177,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -1025,7 +965,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9188,9 +9192,9 @@
+@@ -9184,9 +9188,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -1037,7 +977,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9358,7 +9362,7 @@
+@@ -9354,7 +9358,7 @@
         fi
         ;;
  
@@ -1046,7 +986,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9467,7 +9471,7 @@
+@@ -9463,7 +9467,7 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -1055,7 +995,7 @@
    test "$enable_shared" = yes && enable_static=no
    ;;
  esac
-@@ -9609,11 +9613,12 @@
+@@ -9605,11 +9609,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -1070,7 +1010,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9663,7 +9668,7 @@
+@@ -9659,7 +9664,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1079,7 +1019,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9794,7 +9799,7 @@
+@@ -9790,7 +9795,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -1088,7 +1028,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -9825,7 +9830,7 @@
+@@ -9821,7 +9826,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -1097,7 +1037,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10069,7 +10074,10 @@
+@@ -10065,7 +10070,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -1109,7 +1049,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10142,7 +10150,7 @@
+@@ -10138,7 +10146,7 @@
    symcode='[[BCDEGQRST]]'
    ;;
  solaris* | sysv5*)
@@ -1118,7 +1058,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10160,7 +10168,7 @@
+@@ -10156,7 +10164,7 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -1127,7 +1067,7 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -10375,7 +10383,7 @@
+@@ -10371,7 +10379,7 @@
  	    ;;
  	esac
  	;;
@@ -1136,7 +1076,7 @@
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -10426,7 +10434,7 @@
+@@ -10422,7 +10430,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1145,7 +1085,7 @@
  	  cxx)
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10451,7 +10459,7 @@
+@@ -10447,7 +10455,7 @@
  	    ;;
  	esac
  	;;
@@ -1154,7 +1094,7 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -10762,6 +10770,9 @@
+@@ -10758,6 +10766,9 @@
    cygwin* | mingw*)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -1164,7 +1104,7 @@
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -10786,7 +10797,7 @@
+@@ -10782,7 +10793,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -1173,7 +1113,7 @@
    _LT_AC_TAGVAR(always_export_symbols, $1)=no
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10860,7 +10871,7 @@
+@@ -10856,7 +10867,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -1182,7 +1122,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10870,13 +10881,13 @@
+@@ -10866,13 +10877,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1198,7 +1138,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10885,19 +10896,19 @@
+@@ -10881,19 +10892,19 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -1222,7 +1162,7 @@
        fi
        ;;
  
-@@ -10915,8 +10926,8 @@
+@@ -10911,8 +10922,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1233,7 +1173,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10929,10 +10940,36 @@
+@@ -10925,10 +10936,36 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
@@ -1272,7 +1212,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10982,9 +11019,20 @@
+@@ -10978,9 +11015,20 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -1295,7 +1235,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11030,29 +11078,29 @@
+@@ -11026,29 +11074,29 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -1334,7 +1274,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11067,7 +11115,7 @@
+@@ -11063,7 +11111,7 @@
  	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
  	  # This is similar to how AIX traditionally builds it's shared libraries.
@@ -1343,7 +1283,7 @@
  	fi
        fi
        ;;
-@@ -11090,13 +11138,13 @@
+@@ -11086,13 +11134,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1360,7 +1300,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
        # FIXME: Should let the user specify the lib program.
-@@ -11110,21 +11158,21 @@
+@@ -11106,21 +11154,21 @@
        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
        case "$host_os" in
        rhapsody* | darwin1.[[012]])
@@ -1395,7 +1335,7 @@
  	;;
        esac
      	lt_int_apple_cc_single_mod=no
-@@ -11133,26 +11181,26 @@
+@@ -11129,26 +11177,26 @@
      	  lt_int_apple_cc_single_mod=yes
      	fi
      	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1430,7 +1370,7 @@
        ;;
  
      dgux*)
-@@ -11185,8 +11233,8 @@
+@@ -11181,8 +11229,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1441,7 +1381,7 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11194,7 +11242,7 @@
+@@ -11190,7 +11238,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -1450,7 +1390,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -11212,10 +11260,10 @@
+@@ -11208,10 +11256,10 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
  	case "$host_cpu" in
  	hppa*64*|ia64*)
@@ -1463,7 +1403,7 @@
  	  ;;
  	esac
        else
-@@ -11262,7 +11310,7 @@
+@@ -11258,7 +11306,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -1472,7 +1412,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11272,7 +11320,7 @@
+@@ -11268,7 +11316,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -1481,7 +1421,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11295,7 +11343,7 @@
+@@ -11291,7 +11339,7 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1490,7 +1430,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11305,7 +11353,7 @@
+@@ -11301,7 +11349,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -1499,7 +1439,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11316,14 +11364,14 @@
+@@ -11312,14 +11360,14 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1516,7 +1456,7 @@
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11335,7 +11383,7 @@
+@@ -11331,7 +11379,7 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1525,7 +1465,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11360,9 +11408,9 @@
+@@ -11356,9 +11404,9 @@
      solaris*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
        if test "$GCC" = yes; then
@@ -1537,7 +1477,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11382,7 +11430,7 @@
+@@ -11378,7 +11426,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -1546,7 +1486,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11442,9 +11490,9 @@
+@@ -11438,9 +11486,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -1558,7 +1498,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11502,7 +11550,7 @@
+@@ -11498,7 +11546,7 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1567,7 +1507,7 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -11661,8 +11709,8 @@
+@@ -11657,8 +11705,8 @@
      fi
    done
  done
@@ -1579,21 +1519,6 @@
  
 --- aclocal.m4
 +++ aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005  Free Software Foundation, Inc.
-@@ -28,7 +28,7 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.5])])
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
- 
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
 @@ -501,6 +501,35 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
@@ -7261,67 +7186,15 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdegraphics, "3.4.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdegraphics, "3.4.3") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
  KDE_SET_PREFIX
  
  dnl generate the config header
---- doc/Makefile.in
-+++ doc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -213,6 +213,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -399,13 +402,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. kcoloredit kamera kooka kpdf kruler kview kolourpaint kpovmodeler kuickshow kiconedit kghostview ksnapshot kdvi kgamma
-+SUBDIRS =. kdvi kpdf kooka kview kcoloredit ksnapshot kamera kgamma kruler kuickshow kolourpaint kiconedit kghostview kpovmodeler
- #>- 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*) \
-@@ -443,9 +446,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- doc/kamera/Makefile.in
 +++ doc/kamera/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7355,12 +7228,6 @@
  mostlyclean-libtool:
 --- doc/kcoloredit/Makefile.in
 +++ doc/kcoloredit/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7394,12 +7261,6 @@
  mostlyclean-libtool:
 --- doc/kdvi/Makefile.in
 +++ doc/kdvi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7470,12 +7331,6 @@
  
 --- doc/kgamma/Makefile.in
 +++ doc/kgamma/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7509,12 +7364,6 @@
  mostlyclean-libtool:
 --- doc/kghostview/Makefile.in
 +++ doc/kghostview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7548,12 +7397,6 @@
  mostlyclean-libtool:
 --- doc/kiconedit/Makefile.in
 +++ doc/kiconedit/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7587,12 +7430,6 @@
  mostlyclean-libtool:
 --- doc/kolourpaint/Makefile.in
 +++ doc/kolourpaint/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7663,12 +7500,6 @@
  
 --- doc/kooka/Makefile.in
 +++ doc/kooka/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7739,12 +7570,6 @@
  
 --- doc/kpdf/Makefile.in
 +++ doc/kpdf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7778,12 +7603,6 @@
  mostlyclean-libtool:
 --- doc/kpovmodeler/Makefile.in
 +++ doc/kpovmodeler/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7854,12 +7673,6 @@
  
 --- doc/kruler/Makefile.in
 +++ doc/kruler/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7893,12 +7706,6 @@
  mostlyclean-libtool:
 --- doc/ksnapshot/Makefile.in
 +++ doc/ksnapshot/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7965,12 +7772,6 @@
  
 --- doc/kuickshow/Makefile.in
 +++ doc/kuickshow/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8004,12 +7805,6 @@
  mostlyclean-libtool:
 --- doc/kview/Makefile.in
 +++ doc/kview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8074,15 +7869,9 @@
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
---- kamera/Makefile.in
-+++ kamera/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -214,6 +214,9 @@
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -213,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8092,7 +7881,14 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -399,13 +402,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kcoloredit kamera kooka kpdf kruler kview kolourpaint kpovmodeler kuickshow kiconedit kghostview ksnapshot kdvi kgamma
++SUBDIRS =. kdvi kpdf kooka kview kcoloredit ksnapshot kamera kgamma kruler kuickshow kolourpaint kiconedit kghostview kpovmodeler
+ #>- all: all-recursive
+ #>+ 1
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -8101,7 +7897,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8115,22 +7911,7 @@
  mostlyclean-libtool:
 --- kamera/kcontrol/Makefile.in
 +++ kamera/kcontrol/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kcm_kamera_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -251,6 +249,9 @@
+@@ -249,6 +249,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8140,7 +7921,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,7 +448,7 @@
+@@ -445,7 +448,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8149,7 +7930,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -485,9 +486,9 @@
+@@ -483,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8163,22 +7944,7 @@
  	@$(NORMAL_INSTALL)
 --- kamera/kioslave/Makefile.in
 +++ kamera/kioslave/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -20,8 +20,6 @@
- 
- 
- 
--SOURCES = $(kio_kamera_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -248,6 +246,9 @@
+@@ -246,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8188,7 +7954,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,7 +447,7 @@
+@@ -444,7 +447,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8197,7 +7963,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -484,9 +485,9 @@
+@@ -482,9 +485,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8209,14 +7975,41 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kamera/Makefile.in
++++ kamera/Makefile.in
+@@ -214,6 +214,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -402,7 +405,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*) \
+@@ -440,9 +443,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
 --- kamera/pics/Makefile.in
 +++ kamera/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8295,22 +8088,7 @@
  force-reedit:
 --- kcoloredit/Makefile.in
 +++ kcoloredit/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kcolorchooser_SOURCES) $(kcoloredit_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -271,6 +269,9 @@
+@@ -269,6 +269,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8320,7 +8098,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -483,7 +484,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8329,7 +8107,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -521,9 +522,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8341,7 +8119,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -836,18 +837,18 @@
+@@ -834,18 +837,18 @@
  .NOEXPORT:
  
  #>+ 3
@@ -8366,7 +8144,7 @@
  
  #>+ 3
  kcoloreditdoc.moc: $(srcdir)/kcoloreditdoc.h
-@@ -921,34 +922,34 @@
+@@ -919,34 +922,34 @@
  
  #>+ 3
  clean-metasources:
@@ -8412,7 +8190,7 @@
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcoloredit.png
  
  #>+ 15
-@@ -990,7 +991,7 @@
+@@ -988,7 +991,7 @@
  
  
  #>+ 11
@@ -8423,22 +8201,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kcoloredit.all_cpp.final; \
 --- kdvi/Makefile.in
 +++ kdvi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- 
- 
- 
--SOURCES = $(kdvipart_la_SOURCES) $(kdvi_SOURCES) $(squeeze_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -308,6 +306,9 @@
+@@ -306,6 +306,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8448,7 +8211,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +555,7 @@
+@@ -552,7 +555,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -8457,7 +8220,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +593,9 @@
+@@ -590,9 +593,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8469,7 +8232,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1163,13 +1164,6 @@
+@@ -1161,13 +1164,6 @@
  
  
  #>+ 3
@@ -8483,7 +8246,7 @@
  psgs.moc: $(srcdir)/psgs.h
  	$(MOC) $(srcdir)/psgs.h -o psgs.moc
  
-@@ -1177,11 +1171,11 @@
+@@ -1175,11 +1171,11 @@
  mocs: psgs.moc
  
  #>+ 3
@@ -8498,7 +8261,7 @@
  
  #>+ 3
  fontprogress.moc: $(srcdir)/fontprogress.h
-@@ -1191,6 +1185,13 @@
+@@ -1189,6 +1185,13 @@
  mocs: fontprogress.moc
  
  #>+ 3
@@ -8512,7 +8275,7 @@
  dviwin.moc: $(srcdir)/dviwin.h
  	$(MOC) $(srcdir)/dviwin.h -o dviwin.moc
  
-@@ -1205,18 +1206,18 @@
+@@ -1203,18 +1206,18 @@
  mocs: fontpool.moc
  
  #>+ 3
@@ -8537,7 +8300,7 @@
  
  #>+ 3
  optionDialogFontsWidget.moc: $(srcdir)/optionDialogFontsWidget.h
-@@ -1227,10 +1228,10 @@
+@@ -1225,10 +1228,10 @@
  
  #>+ 3
  clean-metasources:
@@ -8552,12 +8315,6 @@
  clean-ui:
 --- kdvi/pix/Makefile.in
 +++ kdvi/pix/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8613,22 +8370,7 @@
  force-reedit:
 --- kfax/Makefile.in
 +++ kfax/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfax_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -256,6 +254,9 @@
+@@ -254,6 +254,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8638,7 +8380,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,7 +462,7 @@
+@@ -459,7 +462,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8647,7 +8389,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -499,9 +500,9 @@
+@@ -497,9 +500,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8659,7 +8401,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -855,15 +856,15 @@
+@@ -853,15 +856,15 @@
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/cr32-app-kfax.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfax.png
@@ -8680,22 +8422,7 @@
  force-reedit:
 --- kfaxview/Makefile.in
 +++ kfaxview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kfaxpart_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -254,6 +252,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8705,7 +8432,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -455,7 +456,7 @@
+@@ -453,7 +456,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -8714,7 +8441,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -493,9 +494,9 @@
+@@ -491,9 +494,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8726,15 +8453,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kfile-plugins/Makefile.in
-+++ kfile-plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -214,6 +214,9 @@
+--- kfile-plugins/bmp/Makefile.in
++++ kfile-plugins/bmp/Makefile.in
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8744,16 +8465,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
- all: docs-am  all-recursive
+@@ -446,7 +449,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*) \
-@@ -444,9 +447,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8763,26 +8484,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- kfile-plugins/bmp/Makefile.in
-+++ kfile-plugins/bmp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_bmp_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kfile-plugins/dds/Makefile.in
++++ kfile-plugins/dds/Makefile.in
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8792,7 +8498,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -446,7 +449,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8801,7 +8507,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8813,24 +8519,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kfile-plugins/dds/Makefile.in
-+++ kfile-plugins/dds/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_dds_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+--- kfile-plugins/dvi/Makefile.in
++++ kfile-plugins/dvi/Makefile.in
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8840,7 +8531,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -446,7 +449,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8849,7 +8540,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8861,24 +8552,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kfile-plugins/dvi/Makefile.in
-+++ kfile-plugins/dvi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_dvi_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+--- kfile-plugins/exr/Makefile.in
++++ kfile-plugins/exr/Makefile.in
+@@ -244,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8888,7 +8564,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -449,7 +452,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8897,7 +8573,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -487,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8909,24 +8585,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kfile-plugins/exr/Makefile.in
-+++ kfile-plugins/exr/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_exr_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+--- kfile-plugins/gif/Makefile.in
++++ kfile-plugins/gif/Makefile.in
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8936,7 +8597,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +452,7 @@
+@@ -447,7 +450,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8945,7 +8606,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +490,9 @@
+@@ -485,9 +488,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8957,24 +8618,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kfile-plugins/gif/Makefile.in
-+++ kfile-plugins/gif/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_gif_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+--- kfile-plugins/ico/Makefile.in
++++ kfile-plugins/ico/Makefile.in
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8984,7 +8630,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,7 +450,7 @@
+@@ -446,7 +449,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8993,7 +8639,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -487,9 +488,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9005,24 +8651,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kfile-plugins/ico/Makefile.in
-+++ kfile-plugins/ico/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_ico_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+--- kfile-plugins/jpeg/Makefile.in
++++ kfile-plugins/jpeg/Makefile.in
+@@ -246,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9032,7 +8663,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -450,7 +453,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9041,7 +8672,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -488,9 +491,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9053,24 +8684,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kfile-plugins/jpeg/Makefile.in
-+++ kfile-plugins/jpeg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_jpeg_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -248,6 +246,9 @@
+--- kfile-plugins/Makefile.in
++++ kfile-plugins/Makefile.in
+@@ -214,6 +214,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9080,16 +8696,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,7 +453,7 @@
+@@ -406,7 +409,7 @@
+ all: docs-am  all-recursive
  
  .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*) \
-@@ -490,9 +491,9 @@
+@@ -444,9 +447,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9099,26 +8715,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
+ 
+ mostlyclean-libtool:
 --- kfile-plugins/pcx/Makefile.in
 +++ kfile-plugins/pcx/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_pcx_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+@@ -244,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9128,7 +8729,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,7 +448,7 @@
+@@ -445,7 +448,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9137,7 +8738,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -485,9 +486,9 @@
+@@ -483,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9151,22 +8752,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/pdf/Makefile.in
 +++ kfile-plugins/pdf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_pdf_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9176,7 +8762,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -446,7 +449,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9185,7 +8771,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9199,22 +8785,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/png/Makefile.in
 +++ kfile-plugins/png/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_png_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9224,7 +8795,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -446,7 +449,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9233,7 +8804,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9247,22 +8818,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/pnm/Makefile.in
 +++ kfile-plugins/pnm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_pnm_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9272,7 +8828,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -446,7 +449,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9281,7 +8837,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9295,22 +8851,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/ps/Makefile.in
 +++ kfile-plugins/ps/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(gsthumbnail_la_SOURCES) $(kfile_ps_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -252,6 +250,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9320,7 +8861,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -458,7 +459,7 @@
+@@ -456,7 +459,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9329,7 +8870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -496,9 +497,9 @@
+@@ -494,9 +497,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9343,22 +8884,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/rgb/Makefile.in
 +++ kfile-plugins/rgb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_rgb_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9368,7 +8894,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -446,7 +449,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9377,7 +8903,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9391,22 +8917,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/tga/Makefile.in
 +++ kfile-plugins/tga/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_tga_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9416,7 +8927,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -446,7 +449,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9425,7 +8936,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9439,22 +8950,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/tiff/Makefile.in
 +++ kfile-plugins/tiff/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_tiff_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+@@ -244,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9464,7 +8960,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,7 +448,7 @@
+@@ -445,7 +448,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9473,7 +8969,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -485,9 +486,9 @@
+@@ -483,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9487,22 +8983,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/xbm/Makefile.in
 +++ kfile-plugins/xbm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_xbm_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9512,7 +8993,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -446,7 +449,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9521,7 +9002,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9535,22 +9016,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/xpm/Makefile.in
 +++ kfile-plugins/xpm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_xpm_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9560,7 +9026,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,7 +447,7 @@
+@@ -444,7 +447,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9569,7 +9035,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -484,9 +485,9 @@
+@@ -482,9 +485,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9581,63 +9047,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kgamma/Makefile.in
-+++ kgamma/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -214,6 +214,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,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*) \
-@@ -440,9 +443,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
 --- kgamma/kcmkgamma/Makefile.in
 +++ kgamma/kcmkgamma/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kcm_kgamma_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -260,6 +258,9 @@
+@@ -258,6 +258,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9647,7 +9059,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -459,7 +460,7 @@
+@@ -457,7 +460,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9656,7 +9068,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -497,9 +498,9 @@
+@@ -495,9 +498,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9668,7 +9080,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -903,22 +904,22 @@
+@@ -901,22 +904,22 @@
  mocs: displaynumber.moc
  
  #>+ 3
@@ -9700,12 +9112,6 @@
  KDE_DIST=gammactrl.h xf86configpath.h kgamma.h kgamma.desktop displaynumber.h Makefile.in xvidextwrap.h Makefile.am 
 --- kgamma/kcmkgamma/pics/Makefile.in
 +++ kgamma/kcmkgamma/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -207,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9737,24 +9143,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kgamma/xf86gammacfg/Makefile.in
-+++ kgamma/xf86gammacfg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+--- kgamma/Makefile.in
++++ kgamma/Makefile.in
+@@ -214,6 +214,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -402,7 +405,7 @@
+ all: docs-am  all-recursive
  
-@@ -16,8 +16,6 @@
- @SET_MAKE@
+ .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*) \
+@@ -440,9 +443,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
--SOURCES = $(xf86gammacfg_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -235,6 +233,9 @@
+ mostlyclean-libtool:
+--- kgamma/xf86gammacfg/Makefile.in
++++ kgamma/xf86gammacfg/Makefile.in
+@@ -233,6 +233,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9764,7 +9188,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +430,7 @@
+@@ -427,7 +430,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9773,7 +9197,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +468,9 @@
+@@ -465,9 +468,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9785,24 +9209,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kghostview/Makefile.in
-+++ kghostview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+--- kghostview/data/Makefile.in
++++ kghostview/data/Makefile.in
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-am
  
-@@ -19,8 +19,6 @@
+ .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*) \
+@@ -434,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- 
--SOURCES = $(libdscparse_la_SOURCES) $(libkghostviewlib_la_SOURCES) $(libkghostviewpart_la_SOURCES) $(kghostview_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -316,6 +314,9 @@
+ mostlyclean-libtool:
+--- kghostview/Makefile.in
++++ kghostview/Makefile.in
+@@ -314,6 +314,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9812,7 +9254,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +559,7 @@
+@@ -556,7 +559,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -9821,7 +9263,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +597,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9833,7 +9275,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1277,18 +1278,18 @@
+@@ -1275,18 +1278,18 @@
  mocs: kgvmainwidget.moc
  
  #>+ 3
@@ -9858,7 +9300,7 @@
  
  #>+ 3
  viewcontrol.moc: $(srcdir)/viewcontrol.h
-@@ -1322,7 +1323,7 @@
+@@ -1320,7 +1323,7 @@
  
  #>+ 3
  clean-metasources:
@@ -9867,7 +9309,7 @@
  
  #>+ 2
  KDE_DIST=kgv_part.rc cr16-app-kghostview.png update-to-xt-names.pl kghostview.upd generalsettingswidget.ui viewcontrol.cpp cr128-app-kghostview.png viewcontrol.h kghostviewui.rc cr64-app-kghostview.png configuration.kcfgc Makefile.in cr48-app-kghostview.png cr32-app-kghostview.png gssettingswidget.ui.h gssettingswidget.ui kghostview.kcfg version.h generalsettingswidget.ui.h kgv.h Makefile.am 
-@@ -1347,23 +1348,23 @@
+@@ -1345,23 +1348,23 @@
  
  #>+ 19
  install-kde-icons:
@@ -9900,7 +9342,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1416,7 +1417,7 @@
+@@ -1414,7 +1417,7 @@
  	rm -f libdscparse_la.all_cpp.final libdscparse_la.all_cpp.files
  
  #>+ 11
@@ -9909,63 +9351,9 @@
  	@echo 'creating libkghostviewlib_la.all_cpp.cpp ...'; \
  	rm -f libkghostviewlib_la.all_cpp.files libkghostviewlib_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkghostviewlib_la.all_cpp.final; \
---- kghostview/data/Makefile.in
-+++ kghostview/data/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,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*) \
-@@ -434,9 +437,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
 --- kiconedit/Makefile.in
 +++ kiconedit/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kiconedit_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -269,6 +267,9 @@
+@@ -267,6 +267,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9975,7 +9363,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,7 +474,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9984,7 +9372,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -511,9 +512,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9996,7 +9384,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -949,18 +950,18 @@
+@@ -947,18 +950,18 @@
  mocs: kicon.moc
  
  #>+ 3
@@ -10021,7 +9409,7 @@
  
  #>+ 3
  kiconcolors.moc: $(srcdir)/kiconcolors.h
-@@ -970,22 +971,22 @@
+@@ -968,22 +971,22 @@
  mocs: kiconcolors.moc
  
  #>+ 3
@@ -10051,7 +9439,7 @@
  
  #>+ 2
  KDE_DIST=kiconedit.h kiconeditui.rc kiconedit.desktop kicon.h kcolorgrid.h kiconconfig.h properties.h utils.h Makefile.in kresize.h palettetoolbar.h version.h knew.h Makefile.am kicongrid.h kiconcolors.h 
-@@ -1032,7 +1033,7 @@
+@@ -1030,7 +1033,7 @@
  
  
  #>+ 11
@@ -10060,7 +9448,7 @@
  	@echo 'creating kiconedit.all_cpp.cpp ...'; \
  	rm -f kiconedit.all_cpp.files kiconedit.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kiconedit.all_cpp.final; \
-@@ -1079,8 +1080,8 @@
+@@ -1077,8 +1080,8 @@
  knew.lo: knew.moc 
  kiconconfig.o: kiconconfig.moc 
  kiconcolors.o: kiconcolors.moc 
@@ -10070,14 +9458,41 @@
  kcolorgrid.lo: kcolorgrid.moc 
  palettetoolbar.lo: palettetoolbar.moc 
  nmcheck: 
+--- kiconedit/pics/icons/Makefile.in
++++ kiconedit/pics/icons/Makefile.in
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -399,7 +402,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*) \
+@@ -437,9 +440,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
 --- kiconedit/pics/Makefile.in
 +++ kiconedit/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -213,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -10130,14 +9545,8 @@
  
  #>+ 15
  force-reedit:
---- kiconedit/pics/icons/Makefile.in
-+++ kiconedit/pics/icons/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
+--- kiconedit/pics/toolbar/Makefile.in
++++ kiconedit/pics/toolbar/Makefile.in
 @@ -207,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -10148,7 +9557,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
+@@ -420,7 +423,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10157,7 +9566,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -458,9 +461,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10169,15 +9578,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kiconedit/pics/toolbar/Makefile.in
-+++ kiconedit/pics/toolbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+@@ -619,7 +622,7 @@
+ .NOEXPORT:
  
-@@ -207,6 +207,9 @@
+ #>+ 2
+-KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png paintbrush-cursor.xpm areaselect.png aim.png pointer.png spraycan.png kdepalette.png fileclose.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am 
++KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png areaselect.png paintbrush-cursor.xpm aim.png pointer.png spraycan.png fileclose.png kdepalette.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+--- kmrml/kmrml/kcontrol/Makefile.in
++++ kmrml/kmrml/kcontrol/Makefile.in
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10187,16 +9599,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
- all: docs-am  all-am
+@@ -451,7 +454,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*) \
-@@ -458,9 +461,9 @@
+@@ -489,9 +492,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10206,26 +9618,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -619,7 +622,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png paintbrush-cursor.xpm areaselect.png aim.png pointer.png spraycan.png kdepalette.png fileclose.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am 
-+KDE_DIST=fill-cursor.xpm ellipse.png eraser-cursor.xpm spraycan-cursor.xpm airbrush-cursor.xpm grid.png line.png paintbrush.png areaselect.png paintbrush-cursor.xpm aim.png pointer.png spraycan.png fileclose.png kdepalette.png flood-cursor.xpm grayscale.png aim-cursor.xpm transform.png window_new.png circle.png selectcircle.png filledcircle.png Makefile.in flood.png rectangle.png selectrect.png colorpicker-cursor.xpm filledrectangle.png filledellipse.png Makefile.am 
- 
- #>+ 2
- docs-am:
---- kmrml/Makefile.in
-+++ kmrml/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -214,6 +214,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kmrml/kmrml/lib/Makefile.in
++++ kmrml/kmrml/lib/Makefile.in
+@@ -236,6 +236,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10235,16 +9632,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
- all: docs-am  all-recursive
+@@ -435,7 +438,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*) \
-@@ -440,9 +443,9 @@
+@@ -473,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10255,40 +9652,10 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- mostlyclean-libtool:
+ clean-noinstLTLIBRARIES:
 --- kmrml/kmrml/Makefile.in
 +++ kmrml/kmrml/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,10 +17,6 @@
- 
- 
- 
--#>- SOURCES = $(kio_mrml_la_SOURCES) $(libkmrmlpart_la_SOURCES) $(mrmlsearch_la_SOURCES)
--#>+ 1
--SOURCES = $(kio_mrml_la_SOURCES) $(libkmrmlpart_la_SOURCES) $(mrmlsearch_la_SOURCES) $(mrmlsearch_SOURCES) 
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -126,8 +122,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kio_mrml_la_SOURCES) $(libkmrmlpart_la_SOURCES) \
-+#>- 	$(mrmlsearch_la_SOURCES)
-+#>+ 2
- SOURCES = $(kio_mrml_la_SOURCES) $(libkmrmlpart_la_SOURCES) \
--	$(mrmlsearch_la_SOURCES)
-+	$(mrmlsearch_la_SOURCES) $(mrmlsearch_SOURCES) 
- #>- DIST_SOURCES = $(kio_mrml_la_SOURCES) $(libkmrmlpart_la_SOURCES) \
- #>- 	$(mrmlsearch_la_SOURCES)
- #>+ 2
-@@ -301,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10298,7 +9665,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -520,7 +522,7 @@
+@@ -519,7 +522,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10307,7 +9674,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -558,9 +560,9 @@
+@@ -557,9 +560,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10319,7 +9686,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1142,18 +1144,18 @@
+@@ -1142,18 +1145,18 @@
  mocs: browser.moc
  
  #>+ 3
@@ -10344,7 +9711,7 @@
  
  #>+ 3
  algorithmcombo.moc: $(srcdir)/algorithmcombo.h
-@@ -1196,7 +1198,7 @@
+@@ -1196,7 +1199,7 @@
  
  #>+ 3
  clean-metasources:
@@ -10353,7 +9720,7 @@
  
  #>+ 2
  KDE_DIST=mrml_creator.h browser.h mrml.protocol mrml-servicemenu.desktop propertywidgets.h mrml_part.desktop mrml_view.h algorithmdialog.h mrml_elements.h propertysheet.h collectioncombo.h mrml.h Makefile.in algorithmcombo.h mrml.desktop loader.h propertywidgets.cpp mrml_part.h Makefile.am 
-@@ -1247,7 +1249,7 @@
+@@ -1247,7 +1250,7 @@
  
  
  #>+ 11
@@ -10362,24 +9729,9 @@
  	@echo 'creating libkmrmlpart_la.all_cpp.cpp ...'; \
  	rm -f libkmrmlpart_la.all_cpp.files libkmrmlpart_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkmrmlpart_la.all_cpp.final; \
---- kmrml/kmrml/kcontrol/Makefile.in
-+++ kmrml/kmrml/kcontrol/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kcm_kmrml_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -252,6 +250,9 @@
+--- kmrml/kmrml/server/Makefile.in
++++ kmrml/kmrml/server/Makefile.in
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10389,7 +9741,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -453,7 +454,7 @@
+@@ -442,7 +445,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10398,7 +9750,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -491,9 +492,9 @@
+@@ -480,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10410,24 +9762,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kmrml/kmrml/lib/Makefile.in
-+++ kmrml/kmrml/lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libkmrmlstuff_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -238,6 +236,9 @@
+--- kmrml/Makefile.in
++++ kmrml/Makefile.in
+@@ -214,6 +214,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10437,16 +9774,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -437,7 +438,7 @@
+@@ -402,7 +405,7 @@
+ all: docs-am  all-recursive
  
  .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*) \
-@@ -475,9 +476,9 @@
+@@ -440,9 +443,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10457,25 +9794,10 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
---- kmrml/kmrml/server/Makefile.in
-+++ kmrml/kmrml/server/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kded_daemonwatcher_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+ mostlyclean-libtool:
+--- kolourpaint/cursors/Makefile.in
++++ kolourpaint/cursors/Makefile.in
+@@ -233,6 +233,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10485,7 +9807,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +445,7 @@
+@@ -430,7 +433,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10494,7 +9816,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +483,9 @@
+@@ -468,9 +471,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10504,26 +9826,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
+ 
+ clean-noinstLTLIBRARIES:
 --- kolourpaint/Makefile.in
 +++ kolourpaint/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kolourpaint_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -294,6 +292,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10533,7 +9840,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -523,7 +524,7 @@
+@@ -521,7 +524,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10542,7 +9849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -561,9 +562,9 @@
+@@ -559,9 +562,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10554,7 +9861,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1085,7 +1086,7 @@
+@@ -1083,7 +1086,7 @@
  	-rm -f  kpthumbnail.moc kpmainwindow.moc kpviewmanager.moc kpviewscrollablecontainer.moc kpdocumentsaveoptionswidget.moc kpselectiondrag.moc kpdocument.moc kpcommandhistory.moc kpselection.moc kpview.moc kpsinglekeytriggersaction.moc
  
  #>+ 2
@@ -10563,24 +9870,9 @@
  
  #>+ 2
  docs-am:
---- kolourpaint/cursors/Makefile.in
-+++ kolourpaint/cursors/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libkolourpaintcursors_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -235,6 +233,9 @@
+--- kolourpaint/pics/custom/Makefile.in
++++ kolourpaint/pics/custom/Makefile.in
+@@ -207,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10590,16 +9882,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -432,7 +433,7 @@
+@@ -403,7 +406,7 @@
+ all: docs-am  all-am
  
  .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*) \
-@@ -470,9 +471,9 @@
+@@ -441,9 +444,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10610,15 +9902,9 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
+ mostlyclean-libtool:
 --- kolourpaint/pics/Makefile.in
 +++ kolourpaint/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -213,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -10752,63 +10038,9 @@
  
  #>+ 15
  force-reedit:
---- kolourpaint/pics/custom/Makefile.in
-+++ kolourpaint/pics/custom/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -403,7 +406,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*) \
-@@ -441,9 +444,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
 --- kolourpaint/pixmapfx/Makefile.in
 +++ kolourpaint/pixmapfx/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libkolourpaintpixmapfx_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -239,6 +237,9 @@
+@@ -237,6 +237,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10818,7 +10050,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,7 +447,7 @@
+@@ -444,7 +447,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10827,7 +10059,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -484,9 +485,9 @@
+@@ -482,9 +485,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10839,7 +10071,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -731,6 +732,20 @@
+@@ -729,6 +732,20 @@
  mocs: kpeffectflatten.moc
  
  #>+ 3
@@ -10860,7 +10092,7 @@
  kpeffectinvert.moc: $(srcdir)/kpeffectinvert.h
  	$(MOC) $(srcdir)/kpeffectinvert.h -o kpeffectinvert.moc
  
-@@ -752,36 +767,22 @@
+@@ -750,36 +767,22 @@
  mocs: kpeffectemboss.moc
  
  #>+ 3
@@ -10904,7 +10136,7 @@
  
  #>+ 2
  KDE_DIST=kpeffectsdialog.h kpeffectemboss.h kpeffectbalance.h kpfloodfill.h kpeffectblursharpen.h kpeffectinvert.h kpeffectreducecolors.h kppixmapfx.h kpeffectflatten.h Makefile.in kpcoloreffect.h Makefile.am 
-@@ -828,7 +829,7 @@
+@@ -826,7 +829,7 @@
  
  
  #>+ 11
@@ -10913,7 +10145,7 @@
  	@echo 'creating libkolourpaintpixmapfx_la.all_cpp.cpp ...'; \
  	rm -f libkolourpaintpixmapfx_la.all_cpp.files libkolourpaintpixmapfx_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkolourpaintpixmapfx_la.all_cpp.final; \
-@@ -870,8 +871,8 @@
+@@ -868,8 +871,8 @@
  #>+ 19
  kpeffectemboss.lo: kpeffectemboss.moc 
  kpeffectsdialog.o: kpeffectsdialog.moc 
@@ -10923,7 +10155,7 @@
  kpeffectflatten.o: kpeffectflatten.moc 
  nmcheck: 
  kpeffectbalance.lo: kpeffectbalance.moc 
-@@ -882,7 +883,7 @@
+@@ -880,7 +883,7 @@
  kpeffectreducecolors.o: kpeffectreducecolors.moc 
  kpeffectflatten.lo: kpeffectflatten.moc 
  kpeffectinvert.o: kpeffectinvert.moc 
@@ -10934,22 +10166,7 @@
  kpeffectsdialog.lo: kpeffectsdialog.moc 
 --- kolourpaint/tools/Makefile.in
 +++ kolourpaint/tools/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libkolourpainttools_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -254,6 +252,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10959,7 +10176,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,7 +498,7 @@
+@@ -495,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10968,7 +10185,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -535,9 +536,9 @@
+@@ -533,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10980,7 +10197,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -960,7 +961,7 @@
+@@ -958,7 +961,7 @@
  	-rm -f  kptool.moc kptoolcolorwasher.moc kptoolflip.moc kptooltext.moc kptoolrectangle.moc kptoolroundedrectangle.moc kptoolpen.moc kptoolairspray.moc kptoolfloodfill.moc kptoolpolyline.moc kptoolskew.moc kptoolpreviewdialog.moc kptoolselection.moc kptoolresizescale.moc kptoolbrush.moc kptoolcolorpicker.moc kptoolline.moc kptoolpolygon.moc kptooleraser.moc kptoolcurve.moc kptoolaction.moc kptoolellipse.moc kptoolrotate.moc
  
  #>+ 2
@@ -10991,22 +10208,7 @@
  docs-am:
 --- kolourpaint/views/Makefile.in
 +++ kolourpaint/views/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libkolourpaintviews_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -236,6 +234,9 @@
+@@ -234,6 +234,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11016,7 +10218,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -437,7 +438,7 @@
+@@ -435,7 +438,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11025,7 +10227,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -475,9 +476,9 @@
+@@ -473,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11037,7 +10239,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -709,18 +710,18 @@
+@@ -707,18 +710,18 @@
  .NOEXPORT:
  
  #>+ 3
@@ -11062,7 +10264,7 @@
  
  #>+ 3
  kpzoomedthumbnailview.moc: $(srcdir)/kpzoomedthumbnailview.h
-@@ -738,7 +739,7 @@
+@@ -736,7 +739,7 @@
  
  #>+ 3
  clean-metasources:
@@ -11071,7 +10273,7 @@
  
  #>+ 2
  KDE_DIST=kpunzoomedthumbnailview.h kpzoomedthumbnailview.h kpzoomedview.h Makefile.in Makefile.am kpthumbnailview.h 
-@@ -785,7 +786,7 @@
+@@ -783,7 +786,7 @@
  
  
  #>+ 11
@@ -11080,7 +10282,7 @@
  	@echo 'creating libkolourpaintviews_la.all_cpp.cpp ...'; \
  	rm -f libkolourpaintviews_la.all_cpp.files libkolourpaintviews_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkolourpaintviews_la.all_cpp.final; \
-@@ -826,8 +827,8 @@
+@@ -824,8 +827,8 @@
  
  #>+ 11
  nmcheck: 
@@ -11092,22 +10294,7 @@
  nmcheck-am: nmcheck
 --- kolourpaint/widgets/Makefile.in
 +++ kolourpaint/widgets/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libkolourpaintwidgets_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11117,7 +10304,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -453,7 +454,7 @@
+@@ -451,7 +454,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11126,7 +10313,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -491,9 +492,9 @@
+@@ -489,9 +492,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11138,7 +10325,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -776,18 +777,18 @@
+@@ -774,18 +777,18 @@
  mocs: kpresizesignallinglabel.moc
  
  #>+ 3
@@ -11163,7 +10350,7 @@
  
  #>+ 3
  kptoolwidgetfillstyle.moc: $(srcdir)/kptoolwidgetfillstyle.h
-@@ -819,10 +820,10 @@
+@@ -817,10 +820,10 @@
  
  #>+ 3
  clean-metasources:
@@ -11176,7 +10363,7 @@
  
  #>+ 2
  docs-am:
-@@ -866,7 +867,7 @@
+@@ -864,7 +867,7 @@
  
  
  #>+ 11
@@ -11185,7 +10372,7 @@
  	@echo 'creating libkolourpaintwidgets_la.all_cpp.cpp ...'; \
  	rm -f libkolourpaintwidgets_la.all_cpp.files libkolourpaintwidgets_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkolourpaintwidgets_la.all_cpp.final; \
-@@ -915,8 +916,8 @@
+@@ -913,8 +916,8 @@
  kpresizesignallinglabel.o: kpresizesignallinglabel.moc 
  kptoolwidgetfillstyle.o: kptoolwidgetfillstyle.moc 
  kpcolorsimilaritydialog.o: kpcolorsimilaritydialog.moc 
@@ -11197,22 +10384,7 @@
  kptoolwidgeterasersize.lo: kptoolwidgeterasersize.moc 
 --- kooka/Makefile.in
 +++ kooka/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kooka_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -283,6 +283,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11222,7 +10394,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -506,7 +507,7 @@
+@@ -504,7 +507,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11231,7 +10403,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -544,9 +545,9 @@
+@@ -542,9 +545,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11243,7 +10415,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -982,81 +983,67 @@
+@@ -980,81 +983,67 @@
  .NOEXPORT:
  
  #>+ 3
@@ -11352,7 +10524,7 @@
  
  #>+ 3
  imageselectline.moc: $(srcdir)/imageselectline.h
-@@ -1080,6 +1067,20 @@
+@@ -1078,6 +1067,20 @@
  mocs: scanpackager.moc
  
  #>+ 3
@@ -11373,7 +10545,7 @@
  kookaview.moc: $(srcdir)/kookaview.h
  	$(MOC) $(srcdir)/kookaview.h -o kookaview.moc
  
-@@ -1087,11 +1088,11 @@
+@@ -1085,11 +1088,11 @@
  mocs: kookaview.moc
  
  #>+ 3
@@ -11388,7 +10560,7 @@
  
  #>+ 3
  kooka.moc: $(srcdir)/kooka.h
-@@ -1109,7 +1110,7 @@
+@@ -1107,7 +1110,7 @@
  
  #>+ 3
  clean-metasources:
@@ -11397,7 +10569,7 @@
  
  #>+ 2
  KDE_DIST=README.KADMOS kookaui.rc WARNING kooka.desktop CREDITS kookarc CHANGES configure.in.in Makefile.in dwmenuaction.h version.h Makefile.am 
-@@ -1156,7 +1157,7 @@
+@@ -1154,7 +1157,7 @@
  
  
  #>+ 11
@@ -11406,7 +10578,7 @@
  	@echo 'creating kooka.all_cpp.cpp ...'; \
  	rm -f kooka.all_cpp.files kooka.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kooka.all_cpp.final; \
-@@ -1201,14 +1202,14 @@
+@@ -1199,14 +1202,14 @@
  kocrbase.lo: kocrbase.moc 
  imgnamecombo.o: imgnamecombo.moc 
  img_saver.o: img_saver.moc 
@@ -11426,12 +10598,6 @@
  imgprintdialog.lo: imgprintdialog.moc 
 --- kooka/pics/Makefile.in
 +++ kooka/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -207,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -11472,24 +10638,9 @@
  
  #>+ 2
  docs-am:
---- kpdf/Makefile.in
-+++ kpdf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libkpdfpart_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -264,6 +262,9 @@
+--- kpdf/conf/Makefile.in
++++ kpdf/conf/Makefile.in
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11499,7 +10650,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,7 +474,7 @@
+@@ -440,7 +443,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11508,7 +10659,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -511,9 +512,9 @@
+@@ -478,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11518,62 +10669,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -968,26 +969,26 @@
  
- #>+ 22
- install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
- 
- uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
- 
- #>+ 15
- force-reedit:
---- kpdf/conf/Makefile.in
-+++ kpdf/conf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libkpdfconf_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+ clean-noinstLTLIBRARIES:
+--- kpdf/core/generator_pdf/Makefile.in
++++ kpdf/core/generator_pdf/Makefile.in
+@@ -227,6 +227,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11583,7 +10683,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,7 +443,7 @@
+@@ -420,7 +423,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11592,7 +10692,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -480,9 +481,9 @@
+@@ -458,9 +461,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11606,22 +10706,7 @@
  clean-noinstLTLIBRARIES:
 --- kpdf/core/Makefile.in
 +++ kpdf/core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libkpdfcore_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -248,6 +246,9 @@
+@@ -246,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11631,7 +10716,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,7 +443,7 @@
+@@ -440,7 +443,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11640,7 +10725,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -480,9 +481,9 @@
+@@ -478,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11652,24 +10737,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- kpdf/core/generator_pdf/Makefile.in
-+++ kpdf/core/generator_pdf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libgeneratorpdf_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -229,6 +227,9 @@
+--- kpdf/Makefile.in
++++ kpdf/Makefile.in
+@@ -262,6 +262,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11679,7 +10749,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +423,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11688,7 +10758,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +461,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11698,26 +10768,47 @@
 -$(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)
+@@ -966,26 +969,26 @@
  
- clean-noinstLTLIBRARIES:
---- kpdf/shell/Makefile.in
-+++ kpdf/shell/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+ #>+ 22
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kpdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
  
-@@ -16,8 +16,6 @@
- @SET_MAKE@
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpdf.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kpdf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpdf.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpdf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpdf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpdf.png
  
- 
--SOURCES = $(kpdf_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+ #>+ 15
+ force-reedit:
+--- kpdf/shell/Makefile.in
++++ kpdf/shell/Makefile.in
+@@ -245,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11727,7 +10818,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +445,7 @@
+@@ -442,7 +445,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11736,7 +10827,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +483,9 @@
+@@ -480,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11750,22 +10841,7 @@
  	@$(NORMAL_INSTALL)
 --- kpdf/ui/Makefile.in
 +++ kpdf/ui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libkpdfui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -236,6 +234,9 @@
+@@ -234,6 +234,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11775,7 +10851,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -431,7 +432,7 @@
+@@ -429,7 +432,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11784,7 +10860,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -469,9 +470,9 @@
+@@ -467,9 +470,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11796,7 +10872,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -750,25 +751,25 @@
+@@ -748,25 +751,25 @@
  mocs: searchwidget.moc
  
  #>+ 3
@@ -11830,7 +10906,7 @@
  
  #>+ 2
  docs-am:
-@@ -812,7 +813,7 @@
+@@ -810,7 +813,7 @@
  
  
  #>+ 11
@@ -11839,14 +10915,74 @@
  	@echo 'creating libkpdfui_la.all_cpp.cpp ...'; \
  	rm -f libkpdfui_la.all_cpp.files libkpdfui_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkpdfui_la.all_cpp.final; \
+--- kpdf/xpdf/fofi/Makefile.in
++++ kpdf/xpdf/fofi/Makefile.in
+@@ -232,6 +232,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -427,7 +430,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*) \
+@@ -465,9 +468,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
+--- kpdf/xpdf/goo/Makefile.in
++++ kpdf/xpdf/goo/Makefile.in
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -431,7 +434,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*) \
+@@ -469,9 +472,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
 --- kpdf/xpdf/Makefile.in
 +++ kpdf/xpdf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -213,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -11878,24 +11014,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kpdf/xpdf/fofi/Makefile.in
-+++ kpdf/xpdf/fofi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+--- kpdf/xpdf/splash/Makefile.in
++++ kpdf/xpdf/splash/Makefile.in
+@@ -242,6 +242,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -437,7 +440,7 @@
  
-@@ -15,8 +15,6 @@
+ .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*) \
+@@ -475,9 +478,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- @SET_MAKE@
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
--SOURCES = $(libfofi_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -234,6 +232,9 @@
+ clean-noinstLTLIBRARIES:
+--- kpdf/xpdf/xpdf/Makefile.in
++++ kpdf/xpdf/xpdf/Makefile.in
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11905,7 +11059,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +430,7 @@
+@@ -456,7 +459,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -11914,7 +11068,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +468,9 @@
+@@ -494,9 +497,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11926,24 +11080,51 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- kpdf/xpdf/goo/Makefile.in
-+++ kpdf/xpdf/goo/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+@@ -761,7 +764,7 @@
+ .NOEXPORT:
  
-@@ -15,8 +15,6 @@
+ #>+ 2
+-KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h xpdf_config.h SplashOutputDev.h Stream-CCITT.h Object.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h FlateStream.cc GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h 
++KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h SplashOutputDev.h xpdf_config.h Object.h Stream-CCITT.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h BuiltinFontTables.h UTF8.h FlateStream.cc GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h 
  
- @SET_MAKE@
+ #>+ 2
+ docs-am:
+--- kpovmodeler/examples/includes/inlined/Makefile.in
++++ kpovmodeler/examples/includes/inlined/Makefile.in
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -399,7 +402,7 @@
+ all: docs-am  all-am
  
--SOURCES = $(libgoo_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+ .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*) \
+@@ -437,9 +440,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
+--- kpovmodeler/examples/includes/Makefile.in
++++ kpovmodeler/examples/includes/Makefile.in
+@@ -213,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11953,16 +11134,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,7 +434,7 @@
+@@ -401,7 +404,7 @@
+ all: docs-am  all-recursive
  
  .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*) \
-@@ -471,9 +472,9 @@
+@@ -439,9 +442,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11973,25 +11154,43 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
---- kpdf/xpdf/splash/Makefile.in
-+++ kpdf/xpdf/splash/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+ mostlyclean-libtool:
+--- kpovmodeler/examples/includes/original/Makefile.in
++++ kpovmodeler/examples/includes/original/Makefile.in
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -399,7 +402,7 @@
+ all: docs-am  all-am
  
-@@ -15,8 +15,6 @@
+ .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*) \
+@@ -437,9 +440,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- @SET_MAKE@
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
--SOURCES = $(libsplash_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -244,6 +242,9 @@
+ mostlyclean-libtool:
+--- kpovmodeler/examples/Makefile.in
++++ kpovmodeler/examples/Makefile.in
+@@ -213,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12001,16 +11200,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +440,7 @@
+@@ -401,7 +404,7 @@
+ all: docs-am  all-recursive
  
  .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*) \
-@@ -477,9 +478,9 @@
+@@ -439,9 +442,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12021,55 +11220,43 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
---- kpdf/xpdf/xpdf/Makefile.in
-+++ kpdf/xpdf/xpdf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+ mostlyclean-libtool:
+--- kpovmodeler/examples/scenes/advanced/Makefile.in
++++ kpovmodeler/examples/scenes/advanced/Makefile.in
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-am
  
-@@ -15,8 +15,6 @@
+ .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*) \
+@@ -434,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- @SET_MAKE@
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
--SOURCES = $(libxpdf_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -59,10 +57,10 @@
- am_libxpdf_la_OBJECTS = Annot.lo Array.lo BuiltinFont.lo \
- 	BuiltinFontTables.lo Catalog.lo CharCodeToUnicode.lo CMap.lo \
- 	Decrypt.lo Dict.lo DCTStream.lo FontEncodingTables.lo \
--	FlateStream.lo Function.lo Gfx.lo GfxFont.lo GfxState.lo \
--	GlobalParams.lo JArithmeticDecoder.lo JBIG2Stream.lo Lexer.lo \
--	Link.lo NameToCharCode.lo Object.lo Outline.lo OutputDev.lo \
--	PDFDoc.lo PDFDocEncoding.lo PSTokenizer.lo Page.lo Parser.lo \
-+	Function.lo Gfx.lo GfxFont.lo GfxState.lo GlobalParams.lo \
-+	JArithmeticDecoder.lo JBIG2Stream.lo Lexer.lo Link.lo \
-+	NameToCharCode.lo Object.lo Outline.lo OutputDev.lo PDFDoc.lo \
-+	PDFDocEncoding.lo PSTokenizer.lo Page.lo Parser.lo \
- 	PSOutputDev.lo SplashOutputDev.lo Stream.lo JPXStream.lo \
- 	TextOutputDev.lo UnicodeMap.lo UnicodeTypeTable.lo XRef.lo
- #>- libxpdf_la_OBJECTS = $(am_libxpdf_la_OBJECTS)
-@@ -71,10 +69,10 @@
- libxpdf_la_nofinal_OBJECTS = Annot.lo Array.lo BuiltinFont.lo \
- 	BuiltinFontTables.lo Catalog.lo CharCodeToUnicode.lo CMap.lo \
- 	Decrypt.lo Dict.lo DCTStream.lo FontEncodingTables.lo \
--	FlateStream.lo Function.lo Gfx.lo GfxFont.lo GfxState.lo \
--	GlobalParams.lo JArithmeticDecoder.lo JBIG2Stream.lo Lexer.lo \
--	Link.lo NameToCharCode.lo Object.lo Outline.lo OutputDev.lo \
--	PDFDoc.lo PDFDocEncoding.lo PSTokenizer.lo Page.lo Parser.lo \
-+	Function.lo Gfx.lo GfxFont.lo GfxState.lo GlobalParams.lo \
-+	JArithmeticDecoder.lo JBIG2Stream.lo Lexer.lo Link.lo \
-+	NameToCharCode.lo Object.lo Outline.lo OutputDev.lo PDFDoc.lo \
-+	PDFDocEncoding.lo PSTokenizer.lo Page.lo Parser.lo \
- 	PSOutputDev.lo SplashOutputDev.lo Stream.lo JPXStream.lo \
- 	TextOutputDev.lo UnicodeMap.lo UnicodeTypeTable.lo XRef.lo
- @KDE_USE_FINAL_FALSE at libxpdf_la_OBJECTS = $(libxpdf_la_nofinal_OBJECTS)
-@@ -252,6 +250,9 @@
+ mostlyclean-libtool:
+--- kpovmodeler/examples/scenes/csg/Makefile.in
++++ kpovmodeler/examples/scenes/csg/Makefile.in
+@@ -207,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12079,25 +11266,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +440,7 @@
- libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la 
- libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
-      Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc \
--     FontEncodingTables.cc FlateStream.cc Function.cc Gfx.cc \
-+     FontEncodingTables.cc Function.cc Gfx.cc \
-      GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc \
-      JBIG2Stream.cc Lexer.cc Link.cc NameToCharCode.cc Object.cc Outline.cc \
-      OutputDev.cc PDFDoc.cc PDFDocEncoding.cc PSTokenizer.cc \
-@@ -458,7 +459,7 @@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-am
  
  .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*) \
-@@ -496,9 +497,9 @@
+@@ -434,9 +437,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12108,56 +11286,109 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
-@@ -528,7 +529,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DCTStream.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Decrypt.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Dict.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FlateStream.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FontEncodingTables.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Function.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Gfx.Plo at am__quote@
-@@ -764,7 +764,7 @@
- .NOEXPORT:
+ mostlyclean-libtool:
+--- kpovmodeler/examples/scenes/interior/Makefile.in
++++ kpovmodeler/examples/scenes/interior/Makefile.in
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-am
  
- #>+ 2
--KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h xpdf_config.h SplashOutputDev.h Stream-CCITT.h Object.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h UTF8.h BuiltinFontTables.h GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h 
-+KDE_DIST=PDFDocEncoding.h Link.h CompactFontTables.h NameToCharCode.h UnicodeTypeTable.h Array.h CharTypes.h JPXStream.h Lexer.h Stream.h PSOutputDev.h Annot.h UnicodeMap.h SplashOutputDev.h xpdf_config.h Object.h Stream-CCITT.h NameToUnicodeTable.h XRef.h Dict.h OutputDev.h Decrypt.h JBIG2Stream.h Catalog.h DCTStream.h Error.h GlobalParams.h UnicodeMapTables.h FontEncodingTables.h PDFDoc.h Gfx.h BuiltinFontTables.h UTF8.h FlateStream.cc GfxFont.h JArithmeticDecoder.h Parser.h CMap.h Function.h CharCodeToUnicode.h Makefile.in BuiltinFont.h FlateStream.h Page.h PSTokenizer.h ErrorCodes.h GfxState.h TextOutputDev.h Makefile.am Outline.h 
+ .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*) \
+@@ -434,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- #>+ 2
- docs-am:
-@@ -808,11 +808,11 @@
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
+--- kpovmodeler/examples/scenes/lights/Makefile.in
++++ kpovmodeler/examples/scenes/lights/Makefile.in
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-am
  
- #>+ 11
--libxpdf_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/Annot.cc $(srcdir)/Array.cc $(srcdir)/BuiltinFont.cc $(srcdir)/BuiltinFontTables.cc $(srcdir)/Catalog.cc $(srcdir)/CharCodeToUnicode.cc $(srcdir)/CMap.cc $(srcdir)/Decrypt.cc $(srcdir)/Dict.cc $(srcdir)/DCTStream.cc $(srcdir)/FontEncodingTables.cc $(srcdir)/FlateStream.cc $(srcdir)/Function.cc $(srcdir)/Gfx.cc $(srcdir)/GfxFont.cc $(srcdir)/GfxState.cc $(srcdir)/GlobalParams.cc $(srcdir)/JArithmeticDecoder.cc $(srcdir)/JBIG2Stream.cc $(srcdir)/Lexer.cc $(srcdir)/Link.cc $(srcdir)/NameToCharCode.cc $(srcdir)/Object.cc $(srcdir)/Outline.cc $(srcdir)/OutputDev.cc $(srcdir)/PDFDoc.cc $(srcdir)/PDFDocEncoding.cc $(srcdir)/PSTokenizer.cc $(srcdir)/Page.cc $(srcdir)/Parser.cc $(srcdir)/PSOutputDev.cc $(srcdir)/SplashOutputDev.cc $(srcdir)/Stream.cc $(srcdir)/JPXStream.cc $(srcdir)/TextOutputDev.cc $(srcdir)/UnicodeMap.cc $(srcdir)/UnicodeTypeTable.cc $(srcdir)/XRef.cc 
-+libxpdf_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/Annot.cc $(srcdir)/Array.cc $(srcdir)/BuiltinFont.cc $(srcdir)/BuiltinFontTables.cc $(srcdir)/Catalog.cc $(srcdir)/CharCodeToUnicode.cc $(srcdir)/CMap.cc $(srcdir)/Decrypt.cc $(srcdir)/Dict.cc $(srcdir)/DCTStream.cc $(srcdir)/FontEncodingTables.cc $(srcdir)/Function.cc $(srcdir)/Gfx.cc $(srcdir)/GfxFont.cc $(srcdir)/GfxState.cc $(srcdir)/GlobalParams.cc $(srcdir)/JArithmeticDecoder.cc $(srcdir)/JBIG2Stream.cc $(srcdir)/Lexer.cc $(srcdir)/Link.cc $(srcdir)/NameToCharCode.cc $(srcdir)/Object.cc $(srcdir)/Outline.cc $(srcdir)/OutputDev.cc $(srcdir)/PDFDoc.cc $(srcdir)/PDFDocEncoding.cc $(srcdir)/PSTokenizer.cc $(srcdir)/Page.cc $(srcdir)/Parser.cc $(srcdir)/PSOutputDev.cc $(srcdir)/SplashOutputDev.cc $(srcdir)/Stream.cc $(srcdir)/JPXStream.cc $(srcdir)/TextOutputDev.cc $(srcdir)/UnicodeMap.cc $(srcdir)/UnicodeTypeTable.cc $(srcdir)/XRef.cc 
- 	@echo 'creating libxpdf_la.all_cc.cc ...'; \
- 	rm -f libxpdf_la.all_cc.files libxpdf_la.all_cc.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libxpdf_la.all_cc.final; \
--	for file in Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc FontEncodingTables.cc FlateStream.cc Function.cc Gfx.cc GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc JBIG2Stream.cc Lexer.cc Link.cc NameToCharCode.cc Object.cc Outline.cc OutputDev.cc PDFDoc.cc PDFDocEncoding.cc PSTokenizer.cc Page.cc Parser.cc PSOutputDev.cc SplashOutputDev.cc Stream.cc JPXStream.cc TextOutputDev.cc UnicodeMap.cc UnicodeTypeTable.cc XRef.cc ; do \
-+	for file in Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc FontEncodingTables.cc Function.cc Gfx.cc GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc JBIG2Stream.cc Lexer.cc Link.cc NameToCharCode.cc Object.cc Outline.cc OutputDev.cc PDFDoc.cc PDFDocEncoding.cc PSTokenizer.cc Page.cc Parser.cc PSOutputDev.cc SplashOutputDev.cc Stream.cc JPXStream.cc TextOutputDev.cc UnicodeMap.cc UnicodeTypeTable.cc XRef.cc ; do \
- 	  echo "#include \"$$file\"" >> libxpdf_la.all_cc.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libxpdf_la.all_cc.final; \
- 	done; \
---- kpovmodeler/Makefile.in
-+++ kpovmodeler/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+ .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*) \
+@@ -434,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
-@@ -18,8 +18,6 @@
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
+--- kpovmodeler/examples/scenes/Makefile.in
++++ kpovmodeler/examples/scenes/Makefile.in
+@@ -213,6 +213,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -401,7 +404,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*) \
+@@ -439,9 +442,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
--SOURCES = $(libkpovmodeler_la_SOURCES) $(libkpovmodelerpart_la_SOURCES) $(kpovmodeler_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -441,6 +439,9 @@
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
+--- kpovmodeler/examples/scenes/objects/Makefile.in
++++ kpovmodeler/examples/scenes/objects/Makefile.in
+@@ -207,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12167,16 +11398,49 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -957,7 +958,7 @@
+@@ -398,7 +401,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*) \
+@@ -436,9 +439,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
+--- kpovmodeler/Makefile.in
++++ kpovmodeler/Makefile.in
+@@ -439,6 +439,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -955,7 +958,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*) \
-@@ -995,9 +996,9 @@
+@@ -993,9 +996,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12188,7 +11452,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1771,18 +1772,18 @@
+@@ -1769,18 +1772,18 @@
  mocs: pmcylinderedit.moc
  
  #>+ 3
@@ -12213,7 +11477,7 @@
  
  #>+ 3
  pmblobedit.moc: $(srcdir)/pmblobedit.h
-@@ -1820,18 +1821,18 @@
+@@ -1818,18 +1821,18 @@
  mocs: pmobjectselect.moc
  
  #>+ 3
@@ -12238,7 +11502,7 @@
  
  #>+ 3
  pmcameraedit.moc: $(srcdir)/pmcameraedit.h
-@@ -1841,18 +1842,18 @@
+@@ -1839,18 +1842,18 @@
  mocs: pmcameraedit.moc
  
  #>+ 3
@@ -12263,7 +11527,7 @@
  
  #>+ 3
  pmlayoutsettings.moc: $(srcdir)/pmlayoutsettings.h
-@@ -1876,25 +1877,25 @@
+@@ -1874,25 +1877,25 @@
  mocs: pmdockwidget_private.moc
  
  #>+ 3
@@ -12298,7 +11562,7 @@
  
  #>+ 3
  pmlightgroupedit.moc: $(srcdir)/pmlightgroupedit.h
-@@ -1904,11 +1905,11 @@
+@@ -1902,11 +1905,11 @@
  mocs: pmlightgroupedit.moc
  
  #>+ 3
@@ -12313,7 +11577,7 @@
  
  #>+ 3
  pmactions.moc: $(srcdir)/pmactions.h
-@@ -1932,13 +1933,6 @@
+@@ -1930,13 +1933,6 @@
  mocs: pmlibrarybrowser.moc
  
  #>+ 3
@@ -12327,7 +11591,7 @@
  pmlightedit.moc: $(srcdir)/pmlightedit.h
  	$(MOC) $(srcdir)/pmlightedit.h -o pmlightedit.moc
  
-@@ -1946,11 +1940,11 @@
+@@ -1944,11 +1940,11 @@
  mocs: pmlightedit.moc
  
  #>+ 3
@@ -12342,7 +11606,7 @@
  
  #>+ 3
  pmobjectlibrarysettings.moc: $(srcdir)/pmobjectlibrarysettings.h
-@@ -1960,6 +1954,13 @@
+@@ -1958,6 +1954,13 @@
  mocs: pmobjectlibrarysettings.moc
  
  #>+ 3
@@ -12356,7 +11620,7 @@
  pmfactory.moc: $(srcdir)/pmfactory.h
  	$(MOC) $(srcdir)/pmfactory.h -o pmfactory.moc
  
-@@ -1988,18 +1989,18 @@
+@@ -1986,18 +1989,18 @@
  mocs: pmlatheedit.moc
  
  #>+ 3
@@ -12381,7 +11645,7 @@
  
  #>+ 3
  pmclippedbyedit.moc: $(srcdir)/pmclippedbyedit.h
-@@ -2037,18 +2038,18 @@
+@@ -2035,18 +2038,18 @@
  mocs: pmdialogeditbase.moc
  
  #>+ 3
@@ -12406,7 +11670,7 @@
  
  #>+ 3
  pmboundedbyedit.moc: $(srcdir)/pmboundedbyedit.h
-@@ -2177,6 +2178,13 @@
+@@ -2175,6 +2178,13 @@
  mocs: pmphotonsedit.moc
  
  #>+ 3
@@ -12420,7 +11684,7 @@
  pmsoredit.moc: $(srcdir)/pmsoredit.h
  	$(MOC) $(srcdir)/pmsoredit.h -o pmsoredit.moc
  
-@@ -2198,11 +2206,11 @@
+@@ -2196,11 +2206,11 @@
  mocs: pmdeclareedit.moc
  
  #>+ 3
@@ -12435,7 +11699,7 @@
  
  #>+ 3
  pmsqeedit.moc: $(srcdir)/pmsqeedit.h
-@@ -2212,25 +2220,25 @@
+@@ -2210,25 +2220,25 @@
  mocs: pmsqeedit.moc
  
  #>+ 3
@@ -12470,7 +11734,7 @@
  
  #>+ 3
  pmglview.moc: $(srcdir)/pmglview.h
-@@ -2240,13 +2248,6 @@
+@@ -2238,13 +2248,6 @@
  mocs: pmglview.moc
  
  #>+ 3
@@ -12484,7 +11748,7 @@
  pmmaterialedit.moc: $(srcdir)/pmmaterialedit.h
  	$(MOC) $(srcdir)/pmmaterialedit.h -o pmmaterialedit.moc
  
-@@ -2359,18 +2360,18 @@
+@@ -2357,18 +2360,18 @@
  mocs: pmpovrayrenderwidget.moc
  
  #>+ 3
@@ -12509,7 +11773,7 @@
  
  #>+ 3
  pmgridsettings.moc: $(srcdir)/pmgridsettings.h
-@@ -2394,18 +2395,18 @@
+@@ -2392,18 +2395,18 @@
  mocs: pmrendermanager.moc
  
  #>+ 3
@@ -12534,7 +11798,7 @@
  
  #>+ 3
  pmheightfieldedit.moc: $(srcdir)/pmheightfieldedit.h
-@@ -2429,18 +2430,18 @@
+@@ -2427,18 +2430,18 @@
  mocs: pmvectoredit.moc
  
  #>+ 3
@@ -12559,7 +11823,7 @@
  
  #>+ 3
  pmrotateedit.moc: $(srcdir)/pmrotateedit.h
-@@ -2558,7 +2559,7 @@
+@@ -2556,7 +2559,7 @@
  
  #>+ 3
  clean-metasources:
@@ -12568,7 +11832,7 @@
  
  #>+ 2
  KDE_DIST=lo16-app-kpovmodeler.png cr32-mime-kpovmodeler_doc.png baseinsertrules.xml BUGS pmvariant.h pmenumproperty.h questionmark.png kdoc.rules kpovmodelershell.rc Makefile.am StyleConvention REQUIREMENTS pmalledits.h pmmetaobject.h lo32-app-kpovmodeler.png Makefile.in cr32-app-kpovmodeler.png povraydocmap.xml configure.in.in pmthreestate.h cr16-mime-kpovmodeler_doc.png kpovmodelerui.rc cr16-app-kpovmodeler.png cr48-mime-kpovmodeler_doc.png configure.in.bot kpovmodelerbrowser.rc cr48-app-kpovmodeler.png pminsertrules.dtd 
-@@ -2577,32 +2578,32 @@
+@@ -2575,32 +2578,32 @@
  
  #>+ 28
  install-kde-icons:
@@ -12613,443 +11877,8 @@
  
  #>+ 15
  force-reedit:
---- kpovmodeler/examples/Makefile.in
-+++ kpovmodeler/examples/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -213,6 +213,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,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*) \
-@@ -439,9 +442,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
---- kpovmodeler/examples/includes/Makefile.in
-+++ kpovmodeler/examples/includes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -213,6 +213,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,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*) \
-@@ -439,9 +442,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
---- kpovmodeler/examples/includes/inlined/Makefile.in
-+++ kpovmodeler/examples/includes/inlined/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,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*) \
-@@ -437,9 +440,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
---- kpovmodeler/examples/includes/original/Makefile.in
-+++ kpovmodeler/examples/includes/original/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,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*) \
-@@ -437,9 +440,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
---- kpovmodeler/examples/scenes/Makefile.in
-+++ kpovmodeler/examples/scenes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -213,6 +213,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,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*) \
-@@ -439,9 +442,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
---- kpovmodeler/examples/scenes/advanced/Makefile.in
-+++ kpovmodeler/examples/scenes/advanced/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,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*) \
-@@ -434,9 +437,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
---- kpovmodeler/examples/scenes/csg/Makefile.in
-+++ kpovmodeler/examples/scenes/csg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,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*) \
-@@ -434,9 +437,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
---- kpovmodeler/examples/scenes/interior/Makefile.in
-+++ kpovmodeler/examples/scenes/interior/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,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*) \
-@@ -434,9 +437,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
---- kpovmodeler/examples/scenes/lights/Makefile.in
-+++ kpovmodeler/examples/scenes/lights/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,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*) \
-@@ -434,9 +437,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
---- kpovmodeler/examples/scenes/objects/Makefile.in
-+++ kpovmodeler/examples/scenes/objects/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -207,6 +207,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,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*) \
-@@ -436,9 +439,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
---- kpovmodeler/pics/Makefile.in
-+++ kpovmodeler/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -213,6 +213,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,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*) \
-@@ -439,9 +442,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
 --- kpovmodeler/pics/crystalsvg/Makefile.in
 +++ kpovmodeler/pics/crystalsvg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -13490,7 +12319,6 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
@@ -13519,6 +12347,7 @@
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
@@ -13919,7 +12748,6 @@
 -	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
-+	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
  	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
 -	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
 -	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
@@ -13948,6 +12776,7 @@
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
++	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
@@ -13956,12 +12785,6 @@
  force-reedit:
 --- kpovmodeler/pics/locolor/Makefile.in
 +++ kpovmodeler/pics/locolor/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -14270,24 +13093,42 @@
  
  #>+ 15
  force-reedit:
---- kruler/Makefile.in
-+++ kruler/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+--- kpovmodeler/pics/Makefile.in
++++ kpovmodeler/pics/Makefile.in
+@@ -213,6 +213,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -401,7 +404,7 @@
+ all: docs-am  all-recursive
  
-@@ -16,8 +16,6 @@
- @SET_MAKE@
+ .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*) \
+@@ -439,9 +442,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
--SOURCES = $(kruler_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -262,6 +260,9 @@
+ mostlyclean-libtool:
+--- kruler/Makefile.in
++++ kruler/Makefile.in
+@@ -260,6 +260,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14297,7 +13138,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,7 +462,7 @@
+@@ -459,7 +462,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14306,7 +13147,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -499,9 +500,9 @@
+@@ -497,9 +500,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14320,12 +13161,6 @@
  	@$(NORMAL_INSTALL)
 --- kruler/pics/Makefile.in
 +++ kruler/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -207,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -14380,22 +13215,7 @@
  force-reedit:
 --- ksnapshot/Makefile.in
 +++ ksnapshot/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(ksnapshot_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+@@ -245,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14405,7 +13225,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -446,7 +449,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14414,7 +13234,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14426,7 +13246,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -808,19 +809,19 @@
+@@ -806,19 +809,19 @@
  
  #>+ 16
  install-kde-icons:
@@ -14449,72 +13269,9 @@
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ksnapshot.svgz
  
  #>+ 15
---- ksvg/Makefile.in
-+++ ksvg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libksvg_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -259,6 +257,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -459,7 +460,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*) \
-@@ -497,9 +498,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
 --- ksvg/core/Makefile.in
 +++ ksvg/core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libksvgcore_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -248,6 +246,9 @@
+@@ -246,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14524,7 +13281,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,7 +447,7 @@
+@@ -444,7 +447,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -14533,7 +13290,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -484,9 +485,9 @@
+@@ -482,9 +485,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14545,7 +13302,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -790,22 +791,22 @@
+@@ -788,22 +791,22 @@
  mocs: KSVGReader.moc
  
  #>+ 3
@@ -14577,22 +13334,7 @@
  KDE_DIST=KSVGHelper.h KSVGReader.h KSVGLoader.h Makefile.am KSVGTextChunk.h Makefile.in ksvgrenderer.desktop 
 --- ksvg/dom/Makefile.in
 +++ ksvg/dom/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libksvgdom_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -363,6 +361,9 @@
+@@ -361,6 +361,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14602,7 +13344,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +608,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -14611,7 +13353,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +646,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14625,22 +13367,7 @@
  clean-noinstLTLIBRARIES:
 --- ksvg/ecma/Makefile.in
 +++ ksvg/ecma/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libksvgecma_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -234,6 +232,9 @@
+@@ -232,6 +232,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14650,7 +13377,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,7 +428,7 @@
+@@ -425,7 +428,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14659,7 +13386,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -465,9 +466,9 @@
+@@ -463,9 +466,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14671,24 +13398,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- ksvg/impl/Makefile.in
-+++ ksvg/impl/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libksvgdomimpl_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -399,6 +397,9 @@
+--- ksvg/impl/libs/art_support/Makefile.in
++++ ksvg/impl/libs/art_support/Makefile.in
+@@ -222,6 +222,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14698,16 +13410,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -700,7 +701,7 @@
+@@ -413,7 +416,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
+ .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*) \
-@@ -738,9 +739,9 @@
+@@ -451,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14719,23 +13431,8 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -1282,7 +1283,7 @@
- 	-rm -f  SVGScriptElementImpl.moc SVGDocumentImpl.moc SVGImageElementImpl.moc SVGTimeScheduler.moc
- 
- #>+ 2
--KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAElementImpl.h SVGAltGlyphDefElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGTimeScheduler.h SVGNumberListImpl.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGDefsElementImpl.h SVGMPathElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGSVGElementImpl.h SVGTRefElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h 
-+KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGNumberListImpl.h SVGTimeScheduler.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGTRefElementImpl.h SVGSVGElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h 
- 
- #>+ 2
- docs-am:
---- ksvg/impl/libs/Makefile.in
-+++ ksvg/impl/libs/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
+--- ksvg/impl/libs/libtext2path/Makefile.in
++++ ksvg/impl/libs/libtext2path/Makefile.in
 @@ -213,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -14746,7 +13443,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -402,7 +405,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -14755,7 +13452,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -440,9 +443,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14767,24 +13464,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- ksvg/impl/libs/art_support/Makefile.in
-+++ ksvg/impl/libs/art_support/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libksvgart_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -224,6 +222,9 @@
+--- ksvg/impl/libs/libtext2path/src/Makefile.in
++++ ksvg/impl/libs/libtext2path/src/Makefile.in
+@@ -245,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14794,16 +13476,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -415,7 +416,7 @@
+@@ -440,7 +443,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -453,9 +454,9 @@
+@@ -478,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14813,16 +13495,10 @@
 -$(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:
---- ksvg/impl/libs/libtext2path/Makefile.in
-+++ ksvg/impl/libs/libtext2path/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- ksvg/impl/libs/Makefile.in
++++ ksvg/impl/libs/Makefile.in
 @@ -213,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -14833,7 +13509,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
+@@ -401,7 +404,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -14842,7 +13518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -440,9 +443,9 @@
+@@ -439,9 +442,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14854,24 +13530,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- ksvg/impl/libs/libtext2path/src/Makefile.in
-+++ ksvg/impl/libs/libtext2path/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libtext2path_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+--- ksvg/impl/libs/xrgbrender/Makefile.in
++++ ksvg/impl/libs/xrgbrender/Makefile.in
+@@ -222,6 +222,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14881,16 +13542,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,7 +443,7 @@
+@@ -413,7 +416,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .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*) \
-@@ -480,9 +481,9 @@
+@@ -451,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14900,26 +13561,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- ksvg/impl/libs/xrgbrender/Makefile.in
-+++ ksvg/impl/libs/xrgbrender/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
  
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libksvgxrgbrender_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -224,6 +222,9 @@
+ clean-noinstLTLIBRARIES:
+--- ksvg/impl/Makefile.in
++++ ksvg/impl/Makefile.in
+@@ -397,6 +397,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14929,16 +13575,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -415,7 +416,7 @@
+@@ -698,7 +701,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .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*) \
-@@ -453,9 +454,9 @@
+@@ -736,9 +739,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14950,24 +13596,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- ksvg/plugin/Makefile.in
-+++ ksvg/plugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+@@ -1280,7 +1283,7 @@
+ 	-rm -f  SVGScriptElementImpl.moc SVGDocumentImpl.moc SVGImageElementImpl.moc SVGTimeScheduler.moc
  
-@@ -17,8 +17,6 @@
+ #>+ 2
+-KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAElementImpl.h SVGAltGlyphDefElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGTimeScheduler.h SVGNumberListImpl.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGDefsElementImpl.h SVGMPathElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGSVGElementImpl.h SVGTRefElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h 
++KDE_DIST=SVGList.h SVGFEGaussianBlurElementImpl.h SVGComponentTransferFunctionElementImpl.h SVGFontFaceFormatElementImpl.h SVGFEMorphologyElementImpl.h SVGPaintServerImpl.h SVGStringListImpl.h SVGLocatableImpl.h SVGAltGlyphDefElementImpl.h SVGAElementImpl.h SVGForeignObjectElementImpl.h SVGElementImpl.h SVGFESpotLightElementImpl.h SVGAnimateTransformElementImpl.h SVGAnimatedLengthListImpl.h SVGDefinitionSrcElementImpl.h SVGTitleElementImpl.h SVGTSpanElementImpl.h SVGStyleElementImpl.h SVGTransformListImpl.h SVGPathSegMovetoImpl.h SVGPathSegLinetoVerticalImpl.h SVGHelperImpl.h SVGSymbolElementImpl.h SVGFETileElementImpl.h SVGTextPositioningElementImpl.h SVGTestsImpl.h SVGNumberListImpl.h SVGTimeScheduler.h SVGPointImpl.h SVGShapeImpl.h SVGFilterElementImpl.h SVGFEDisplacementMapElementImpl.h SVGTransformImpl.h SVGFETurbulenceElementImpl.h SVGElementInstanceImpl.h SVGFEFuncRElementImpl.h SVGFEFuncAElementImpl.h SVGFESpecularLightingElementImpl.h SVGFEPointLightElementImpl.h SVGMissingGlyphElementImpl.h SVGLinearGradientElementImpl.h SVGAngleImpl.h SVGAnimatedPreserveAspectRatioImpl.h SVGEllipseElementImpl.h SVGFontElementImpl.h SVGGElementImpl.h SVGAnimatedStringImpl.h SVGPreserveAspectRatioImpl.h SVGMatrixImpl.h SVGPathSegLinetoHorizontalImpl.h SVGFitToViewBoxImpl.h SVGDescElementImpl.h SVGFEFuncBElementImpl.h SVGAnimateMotionElementImpl.h SVGPointListImpl.h SVGFontFaceElementImpl.h SVGRadialGradientElementImpl.h SVGFilterPrimitiveStandardAttributesImpl.h SVGPathElementImpl.h SVGAnimateColorElementImpl.h SVGPathSegArcImpl.h SVGFEMergeNodeElementImpl.h SVGFEFloodElementImpl.h SVGAnimatedNumberListImpl.h SVGGlyphElementImpl.h SVGAnimatedBooleanImpl.h SVGFEMergeElementImpl.h SVGColorProfileElementImpl.h SVGFontFaceNameElementImpl.h SVGFEColorMatrixElementImpl.h SVGCircleElementImpl.h SVGRectElementImpl.h SVGFEComponentTransferElementImpl.h SVGAnimatedEnumerationImpl.h SVGAnimatedPathDataImpl.h SVGFEOffsetElementImpl.h SVGPaintImpl.h SVGAnimatedNumberImpl.h Makefile.am SVGAnimateElementImpl.h SVGZoomAndPanImpl.h SVGFontFaceUriElementImpl.h SVGNumberImpl.h SVGElementInstanceListImpl.h SVGPathSegLinetoImpl.h SVGPatternElementImpl.h SVGAltGlyphElementImpl.h SVGStylableImpl.h SVGColorProfileRuleImpl.h SVGAnimatedAngleImpl.h SVGURIReferenceImpl.h Makefile.in SVGEventImpl.h SVGLengthImpl.h SVGTransformableImpl.h SVGTextContentElementImpl.h SVGMPathElementImpl.h SVGDefsElementImpl.h SVGSwitchElementImpl.h SVGFECompositeElementImpl.h SVGHKernElementImpl.h SVGAnimatedLengthImpl.h SVGAnimatedRectImpl.h SVGStopElementImpl.h SVGSetElementImpl.h SVGMarkerElementImpl.h SVGViewElementImpl.h SVGFEFuncGElementImpl.h SVGFEConvolveMatrixElementImpl.h SVGPathSegCurvetoCubicSmoothImpl.h SVGWindowImpl.h SVGImageElementImpl.h SVGAnimationElementImpl.h SVGPathSegClosePathImpl.h SVGFEImageElementImpl.h SVGClipPathElementImpl.h SVGVKernElementImpl.h SVGZoomEventImpl.h SVGTRefElementImpl.h SVGSVGElementImpl.h SVGPathSegListImpl.h SVGICCColorImpl.h SVGPolyElementImpl.h svgpathparser.h SVGTextPathElementImpl.h SVGPathSegImpl.h SVGAnimatedIntegerImpl.h LRUCache.h SVGColorImpl.h SVGGlyphRefElementImpl.h SVGDocumentImpl.h SVGScriptElementImpl.h SVGPathSegCurvetoQuadraticSmoothImpl.h SVGAnimatedTransformListImpl.h SVGCSSRuleImpl.h SVGContainerImpl.h SVGEcma.h SVGPolylineElementImpl.h SVGCursorElementImpl.h SVGMetadataElementImpl.h SVGLengthListImpl.h SVGFEBlendElementImpl.h SVGLangSpaceImpl.h SVGAnimatedPointsImpl.h SVGUseElementImpl.h SVGViewSpecImpl.h SVGFEDiffuseLightingElementImpl.h SVGExternalResourcesRequiredImpl.h SVGFontFaceSrcElementImpl.h SVGTextElementImpl.h SVGGradientElementImpl.h SVGLineElementImpl.h SVGUnitConverter.h SVGBBoxTarget.h SVGRectImpl.h SVGPolygonElementImpl.h SVGFEDistantLightElementImpl.h SVGPathSegCurvetoCubicImpl.h SVGMaskElementImpl.h SVGPathSegCurvetoQuadraticImpl.h 
  
- 
- 
--SOURCES = $(libksvgplugin_la_SOURCES) $(svgthumbnail_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -272,6 +270,9 @@
+ #>+ 2
+ docs-am:
+--- ksvg/Makefile.in
++++ ksvg/Makefile.in
+@@ -257,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14977,16 +13617,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,7 +479,7 @@
+@@ -457,7 +460,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .cc .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -516,9 +517,9 @@
+@@ -495,9 +498,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14996,60 +13636,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -992,18 +993,18 @@
- mocs: svgcreator.moc
- 
- #>+ 3
--ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
--	$(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
-+ksvg_factory.moc: $(srcdir)/ksvg_factory.h
-+	$(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
- 
- #>+ 2
--mocs: ksvg_plugin.moc
-+mocs: ksvg_factory.moc
- 
- #>+ 3
--ksvg_factory.moc: $(srcdir)/ksvg_factory.h
--	$(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
-+ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
-+	$(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
- 
- #>+ 2
--mocs: ksvg_factory.moc
-+mocs: ksvg_plugin.moc
- 
- #>+ 8
- svgthumbnail.la.closure: $(svgthumbnail_la_OBJECTS) $(svgthumbnail_la_DEPENDENCIES)
-@@ -1016,7 +1017,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  ksvg_widget.moc svgcreator.moc ksvg_plugin.moc ksvg_factory.moc
-+	-rm -f  ksvg_widget.moc svgcreator.moc ksvg_factory.moc ksvg_plugin.moc
- 
- #>+ 2
- KDE_DIST=ksvgplugin.rc svgthumbnail.desktop svgcreator.h ksvg_factory.h Makefile.am Makefile.in ksvg_widget.h ksvgplugin.desktop 
-@@ -1067,7 +1068,7 @@
- 
- 
- #>+ 11
--libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp  ksvg_widget.moc ksvg_factory.moc ksvg_plugin.moc
-+libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp  ksvg_widget.moc ksvg_plugin.moc ksvg_factory.moc
- 	@echo 'creating libksvgplugin_la.all_cpp.cpp ...'; \
- 	rm -f libksvgplugin_la.all_cpp.files libksvgplugin_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libksvgplugin_la.all_cpp.final; \
---- ksvg/plugin/backends/Makefile.in
-+++ ksvg/plugin/backends/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -213,6 +213,9 @@
+--- ksvg/plugin/backends/agg/Makefile.in
++++ ksvg/plugin/backends/agg/Makefile.in
+@@ -246,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15059,16 +13650,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
- all: docs-am  all-recursive
+@@ -446,7 +449,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*) \
-@@ -439,9 +442,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15078,26 +13669,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- ksvg/plugin/backends/agg/Makefile.in
-+++ ksvg/plugin/backends/agg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libksvgrendereragg_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -248,6 +246,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- ksvg/plugin/backends/libart/Makefile.in
++++ ksvg/plugin/backends/libart/Makefile.in
+@@ -247,6 +247,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15107,7 +13683,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -443,7 +446,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15116,7 +13692,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -481,9 +484,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15128,24 +13704,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- ksvg/plugin/backends/libart/Makefile.in
-+++ ksvg/plugin/backends/libart/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libksvgrendererlibart_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+--- ksvg/plugin/backends/Makefile.in
++++ ksvg/plugin/backends/Makefile.in
+@@ -213,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15155,16 +13716,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,7 +446,7 @@
+@@ -401,7 +404,7 @@
+ all: docs-am  all-recursive
  
  .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*) \
-@@ -483,9 +484,9 @@
+@@ -439,9 +442,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15174,17 +13735,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- ksvg/test/Makefile.in
-+++ ksvg/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
  
-@@ -213,6 +213,9 @@
+ mostlyclean-libtool:
+--- ksvg/plugin/Makefile.in
++++ ksvg/plugin/Makefile.in
+@@ -270,6 +270,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15194,16 +13749,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
- all: docs-am  all-recursive
+@@ -476,7 +479,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*) \
-@@ -439,9 +442,9 @@
+@@ -514,9 +517,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15213,26 +13768,54 @@
 -$(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,18 +993,18 @@
+ mocs: svgcreator.moc
  
- mostlyclean-libtool:
---- ksvg/test/external/Makefile.in
-+++ ksvg/test/external/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+ #>+ 3
+-ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
+-	$(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
++ksvg_factory.moc: $(srcdir)/ksvg_factory.h
++	$(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
  
-@@ -15,8 +15,6 @@
+ #>+ 2
+-mocs: ksvg_plugin.moc
++mocs: ksvg_factory.moc
  
- @SET_MAKE@
+ #>+ 3
+-ksvg_factory.moc: $(srcdir)/ksvg_factory.h
+-	$(MOC) $(srcdir)/ksvg_factory.h -o ksvg_factory.moc
++ksvg_plugin.moc: $(srcdir)/ksvg_plugin.h
++	$(MOC) $(srcdir)/ksvg_plugin.h -o ksvg_plugin.moc
  
--SOURCES = $(printnodetest_SOURCES) $(svgdisplay_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -241,6 +239,9 @@
+ #>+ 2
+-mocs: ksvg_factory.moc
++mocs: ksvg_plugin.moc
+ 
+ #>+ 8
+ svgthumbnail.la.closure: $(svgthumbnail_la_OBJECTS) $(svgthumbnail_la_DEPENDENCIES)
+@@ -1014,7 +1017,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  ksvg_widget.moc svgcreator.moc ksvg_plugin.moc ksvg_factory.moc
++	-rm -f  ksvg_widget.moc svgcreator.moc ksvg_factory.moc ksvg_plugin.moc
+ 
+ #>+ 2
+ KDE_DIST=ksvgplugin.rc svgthumbnail.desktop svgcreator.h ksvg_factory.h Makefile.am Makefile.in ksvg_widget.h ksvgplugin.desktop 
+@@ -1065,7 +1068,7 @@
+ 
+ 
+ #>+ 11
+-libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp  ksvg_widget.moc ksvg_factory.moc ksvg_plugin.moc
++libksvgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksvg_plugin.cpp $(srcdir)/ksvg_factory.cpp $(srcdir)/ksvg_widget.cpp  ksvg_widget.moc ksvg_plugin.moc ksvg_factory.moc
+ 	@echo 'creating libksvgplugin_la.all_cpp.cpp ...'; \
+ 	rm -f libksvgplugin_la.all_cpp.files libksvgplugin_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libksvgplugin_la.all_cpp.final; \
+--- ksvg/test/external/Makefile.in
++++ ksvg/test/external/Makefile.in
+@@ -239,6 +239,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15242,7 +13825,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -438,7 +439,7 @@
+@@ -436,7 +439,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -15251,7 +13834,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -476,9 +477,9 @@
+@@ -474,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15263,14 +13846,41 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
+--- ksvg/test/Makefile.in
++++ ksvg/test/Makefile.in
+@@ -213,6 +213,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -401,7 +404,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*) \
+@@ -439,9 +442,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
 --- kuickshow/Makefile.in
 +++ kuickshow/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -214,6 +214,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15304,12 +13914,6 @@
  mostlyclean-libtool:
 --- kuickshow/misc/Makefile.in
 +++ kuickshow/misc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -207,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15343,12 +13947,6 @@
  mostlyclean-libtool:
 --- kuickshow/pics/Makefile.in
 +++ kuickshow/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -207,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15382,35 +13980,7 @@
  mostlyclean-libtool:
 --- kuickshow/src/Makefile.in
 +++ kuickshow/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,10 +17,6 @@
- 
- 
- 
--#>- SOURCES = $(kuickshow_la_SOURCES)
--#>+ 1
--SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES) 
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -107,7 +103,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(kuickshow_la_SOURCES)
-+#>- SOURCES = $(kuickshow_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES) 
- #>- DIST_SOURCES = $(kuickshow_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES) 
-@@ -263,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15420,7 +13990,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -476,7 +477,7 @@
+@@ -474,7 +477,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15429,7 +13999,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -514,9 +515,9 @@
+@@ -512,9 +515,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15441,7 +14011,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -918,18 +919,18 @@
+@@ -917,18 +920,18 @@
  mocs: aboutwidget.moc
  
  #>+ 3
@@ -15466,7 +14036,7 @@
  
  #>+ 3
  imagewindow.moc: $(srcdir)/imagewindow.h
-@@ -1003,7 +1004,7 @@
+@@ -1002,7 +1005,7 @@
  
  #>+ 3
  clean-metasources:
@@ -15475,7 +14045,7 @@
  
  #>+ 2
  KDE_DIST=aboutwidget.h imagewindow.h kuickconfigdlg.h mainwidget.cpp kuickdata.h generalwidget.h defaultswidget.h imdata.h kuickshow.desktop kuickglobals.h filewidget.h kuick.h Makefile.am imlibwidget.h Makefile.in mainwidget.h printing.h cr32-app-kuickshow.png filefinder.h cr16-app-kuickshow.png slideshowwidget.h kuickshow.h lo32-app-kuickshow.png kurlwidget.h lo16-app-kuickshow.png kuickio.h version.h 
-@@ -1013,19 +1014,19 @@
+@@ -1012,19 +1015,19 @@
  
  #>+ 16
  install-kde-icons:
@@ -15501,7 +14071,7 @@
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuickshow.png
  
  #>+ 15
-@@ -1067,7 +1068,7 @@
+@@ -1066,7 +1069,7 @@
  
  
  #>+ 11
@@ -15510,7 +14080,7 @@
  	@echo 'creating libkdeinit_kuickshow_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_kuickshow_la.all_cpp.files libkdeinit_kuickshow_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kuickshow_la.all_cpp.final; \
-@@ -1079,7 +1080,7 @@
+@@ -1078,7 +1081,7 @@
  	rm -f libkdeinit_kuickshow_la.all_cpp.final libkdeinit_kuickshow_la.all_cpp.files
  
  #>+ 11
@@ -15519,37 +14089,9 @@
  	@echo 'creating kuickshow_la.all_cpp.cpp ...'; \
  	rm -f kuickshow_la.all_cpp.files kuickshow_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kuickshow_la.all_cpp.final; \
---- kview/Makefile.in
-+++ kview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,10 +18,6 @@
- 
- 
- 
--#>- SOURCES = $(kview_la_SOURCES)
--#>+ 1
--SOURCES = $(kview_la_SOURCES) $(kview_SOURCES) 
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -105,7 +101,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(kview_la_SOURCES)
-+#>- SOURCES = $(kview_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kview_la_SOURCES) $(kview_SOURCES) 
- #>- DIST_SOURCES = $(kview_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kview_la_SOURCES) $(kview_SOURCES) 
-@@ -277,6 +275,9 @@
+--- kview/config/Makefile.in
++++ kview/config/Makefile.in
+@@ -260,6 +260,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15559,7 +14101,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -482,7 +483,7 @@
+@@ -460,7 +463,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15568,7 +14110,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -520,9 +521,9 @@
+@@ -498,9 +501,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15578,47 +14120,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1029,17 +1030,17 @@
- 
- #>+ 13
- install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
- 
- uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
- 
- #>+ 15
- force-reedit:
---- kview/config/Makefile.in
-+++ kview/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kcm_kviewgeneralconfig_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -262,6 +260,9 @@
+--- kview/config/plugins/Makefile.in
++++ kview/config/plugins/Makefile.in
+@@ -244,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15628,7 +14134,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -462,7 +463,7 @@
+@@ -441,7 +444,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15637,7 +14143,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -500,9 +501,9 @@
+@@ -479,9 +482,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15649,24 +14155,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kview/config/plugins/Makefile.in
-+++ kview/config/plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kcm_kviewpluginsconfig_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+--- kview/kimageviewer/Makefile.in
++++ kview/kimageviewer/Makefile.in
+@@ -248,6 +248,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15676,7 +14167,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,7 +444,7 @@
+@@ -449,7 +452,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15685,7 +14176,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -481,9 +482,9 @@
+@@ -487,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15695,26 +14186,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kview/kimageviewer/Makefile.in
-+++ kview/kimageviewer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -19,8 +19,6 @@
- 
- 
- 
--SOURCES = $(libkimageviewer_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -250,6 +248,9 @@
+--- kview/kviewcanvas/config/Makefile.in
++++ kview/kviewcanvas/config/Makefile.in
+@@ -247,6 +247,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15724,7 +14200,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +452,7 @@
+@@ -446,7 +449,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15733,7 +14209,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +490,9 @@
+@@ -484,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15743,26 +14219,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 --- kview/kviewcanvas/Makefile.in
 +++ kview/kviewcanvas/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libkviewcanvas_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -264,6 +262,9 @@
+@@ -262,6 +262,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15772,7 +14233,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,7 +466,7 @@
+@@ -463,7 +466,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15781,7 +14242,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -503,9 +504,9 @@
+@@ -501,9 +504,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15793,24 +14254,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kview/kviewcanvas/config/Makefile.in
-+++ kview/kviewcanvas/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kcm_kviewcanvasconfig_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+--- kview/kviewcanvas/test/Makefile.in
++++ kview/kviewcanvas/test/Makefile.in
+@@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15820,7 +14266,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -424,7 +427,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15829,7 +14275,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -462,9 +465,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15839,26 +14285,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- kview/kviewcanvas/test/Makefile.in
-+++ kview/kviewcanvas/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
  
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--SOURCES = $(test_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -233,6 +231,9 @@
+ clean-checkPROGRAMS:
+--- kview/kviewviewer/config/Makefile.in
++++ kview/kviewviewer/config/Makefile.in
+@@ -245,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15868,7 +14299,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,7 +427,7 @@
+@@ -442,7 +445,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15877,7 +14308,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -464,9 +465,9 @@
+@@ -480,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15887,26 +14318,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-checkPROGRAMS:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- kview/kviewviewer/Makefile.in
 +++ kview/kviewviewer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libkviewviewer_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -267,6 +265,9 @@
+@@ -265,6 +265,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15916,7 +14332,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +473,7 @@
+@@ -470,7 +473,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15925,7 +14341,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -510,9 +511,9 @@
+@@ -508,9 +511,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15937,7 +14353,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -927,18 +928,18 @@
+@@ -925,18 +928,18 @@
  
  
  #>+ 3
@@ -15962,7 +14378,7 @@
  
  #>+ 3
  imagesettings.moc: $(srcdir)/imagesettings.h
-@@ -949,7 +950,7 @@
+@@ -947,7 +950,7 @@
  
  #>+ 3
  clean-metasources:
@@ -15971,7 +14387,7 @@
  
  #>+ 2
  KDE_DIST=kviewvieweriface.h Makefile.am printimagesettings.ui kviewviewer.desktop kviewpopup.rc Makefile.in imagesettings.h kviewviewer.rc kviewviewer_ro.rc 
-@@ -1005,7 +1006,7 @@
+@@ -1003,7 +1006,7 @@
  
  
  #>+ 11
@@ -15980,24 +14396,9 @@
  	@echo 'creating libkviewviewer_la.all_cpp.cpp ...'; \
  	rm -f libkviewviewer_la.all_cpp.files libkviewviewer_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkviewviewer_la.all_cpp.final; \
---- kview/kviewviewer/config/Makefile.in
-+++ kview/kviewviewer/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kcm_kviewviewerpluginsconfig_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+--- kview/kviewviewer/test/Makefile.in
++++ kview/kviewviewer/test/Makefile.in
+@@ -230,6 +230,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16007,7 +14408,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +445,7 @@
+@@ -423,7 +426,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16016,7 +14417,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +483,9 @@
+@@ -461,9 +464,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16026,26 +14427,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- kview/kviewviewer/test/Makefile.in
-+++ kview/kviewviewer/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
  
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--SOURCES = $(test_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -232,6 +230,9 @@
+ clean-checkPROGRAMS:
+--- kview/Makefile.in
++++ kview/Makefile.in
+@@ -275,6 +275,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16055,7 +14441,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -425,7 +426,7 @@
+@@ -480,7 +483,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16064,7 +14450,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -463,9 +464,9 @@
+@@ -518,9 +521,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16074,17 +14460,32 @@
 -$(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)
+@@ -1028,17 +1031,17 @@
  
- clean-checkPROGRAMS:
---- kview/modules/Makefile.in
-+++ kview/modules/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
+ #>+ 13
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kview.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
  
-@@ -213,6 +213,9 @@
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kview.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kview.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kview.png
+ 
+ #>+ 15
+ force-reedit:
+--- kview/modules/browser/Makefile.in
++++ kview/modules/browser/Makefile.in
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16094,16 +14495,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
- all: docs-am  all-recursive
+@@ -439,7 +442,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*) \
-@@ -439,9 +442,9 @@
+@@ -477,9 +480,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16113,26 +14514,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- kview/modules/browser/Makefile.in
-+++ kview/modules/browser/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kview_browserplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kview/modules/effects/Makefile.in
++++ kview/modules/effects/Makefile.in
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16142,7 +14528,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -441,7 +442,7 @@
+@@ -436,7 +439,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16151,7 +14537,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -479,9 +480,9 @@
+@@ -474,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16163,24 +14549,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kview/modules/effects/Makefile.in
-+++ kview/modules/effects/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kview_effectsplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+--- kview/modules/Makefile.in
++++ kview/modules/Makefile.in
+@@ -213,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16190,16 +14561,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -438,7 +439,7 @@
+@@ -401,7 +404,7 @@
+ all: docs-am  all-recursive
  
  .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*) \
-@@ -476,9 +477,9 @@
+@@ -439,9 +442,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16209,26 +14580,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- kview/modules/presenter/Makefile.in
-+++ kview/modules/presenter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
  
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kview_presenterplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -262,6 +260,9 @@
+ mostlyclean-libtool:
+--- kview/modules/presenter/config/Makefile.in
++++ kview/modules/presenter/config/Makefile.in
+@@ -244,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16238,7 +14594,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,7 +462,7 @@
+@@ -441,7 +444,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16247,7 +14603,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -499,9 +500,9 @@
+@@ -479,9 +482,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16259,24 +14615,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kview/modules/presenter/config/Makefile.in
-+++ kview/modules/presenter/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kcm_kviewpresenterconfig_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+--- kview/modules/presenter/Makefile.in
++++ kview/modules/presenter/Makefile.in
+@@ -260,6 +260,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16286,7 +14627,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,7 +444,7 @@
+@@ -459,7 +462,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16295,7 +14636,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -481,9 +482,9 @@
+@@ -497,9 +500,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16309,22 +14650,7 @@
  	@$(NORMAL_INSTALL)
 --- kview/modules/scale/Makefile.in
 +++ kview/modules/scale/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kview_scale_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+@@ -245,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16334,7 +14660,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,7 +444,7 @@
+@@ -441,7 +444,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16343,7 +14669,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -481,9 +482,9 @@
+@@ -479,9 +482,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16357,22 +14683,7 @@
  	@$(NORMAL_INSTALL)
 --- kview/modules/scanner/Makefile.in
 +++ kview/modules/scanner/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kview_scannerplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16382,7 +14693,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -438,7 +439,7 @@
+@@ -436,7 +439,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16391,7 +14702,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -476,9 +477,9 @@
+@@ -474,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16405,22 +14716,7 @@
  	@$(NORMAL_INSTALL)
 --- kview/modules/template/Makefile.in
 +++ kview/modules/template/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kview_templateplugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -243,6 +241,9 @@
+@@ -241,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16430,7 +14726,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +440,7 @@
+@@ -437,7 +440,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16439,7 +14735,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +478,9 @@
+@@ -475,9 +478,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16453,36 +14749,7 @@
  	@$(NORMAL_INSTALL)
 --- kview/photobook/Makefile.in
 +++ kview/photobook/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libphotobook_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -57,10 +55,10 @@
-     *) f=$$p;; \
-   esac;
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(partdir)" \
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(partdir)" \
- 	"$(DESTDIR)$(partrcdir)"
--libLTLIBRARIES_INSTALL = $(INSTALL)
--LTLIBRARIES = $(lib_LTLIBRARIES)
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libphotobook_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
-@@ -244,6 +242,9 @@
+@@ -242,6 +242,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16492,21 +14759,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,11 +428,9 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- INCLUDES = $(all_includes)
--lib_LTLIBRARIES = libphotobook.la
-+kde_module_LTLIBRARIES = libphotobook.la
- libphotobook_la_SOURCES = photobook.cpp
--#>- libphotobook_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined
--#>+ 1
--libphotobook_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
-+libphotobook_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
- libphotobook_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS)
- partrcdir = $(kde_servicesdir)
- partrc_DATA = photobook.desktop
-@@ -445,7 +444,7 @@
+@@ -441,7 +444,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16515,7 +14768,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -483,32 +482,32 @@
+@@ -479,9 +482,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16525,142 +14778,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-+install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
-+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
--uninstall-libLTLIBRARIES:
-+uninstall-kde_moduleLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
- 	done
- 
--clean-libLTLIBRARIES:
--	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+clean-kde_moduleLTLIBRARIES:
-+	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
-+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- 	  test "$$dir" != "$$p" || dir=.; \
- 	  echo "rm -f \"$${dir}/so_locations\""; \
-@@ -518,7 +517,7 @@
- #>+ 2
- @KDE_USE_CLOSURE_TRUE at libphotobook.la: libphotobook.la.closure $(libphotobook_la_OBJECTS) $(libphotobook_la_DEPENDENCIES) 
- @KDE_USE_CLOSURE_FALSE at libphotobook.la: $(libphotobook_la_OBJECTS) $(libphotobook_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(libdir) $(libphotobook_la_LDFLAGS) $(libphotobook_la_OBJECTS) $(libphotobook_la_LIBADD) $(LIBS)
-+	$(CXXLINK) -rpath $(kde_moduledir) $(libphotobook_la_LDFLAGS) $(libphotobook_la_OBJECTS) $(libphotobook_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -672,7 +671,7 @@
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
- installdirs:
--	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(partdir)" "$(DESTDIR)$(partrcdir)"; do \
-+	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(partdir)" "$(DESTDIR)$(partrcdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
-@@ -703,10 +702,10 @@
- #>+ 1
- clean: kde-rpo-clean  clean-am
- 
--#>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-+#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
- #>- 	mostlyclean-am
- #>+ 2
--clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-libLTLIBRARIES clean-libtool \
-+clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
- 	mostlyclean-am
- 
- distclean: distclean-am
-@@ -725,11 +724,15 @@
- 
- info-am:
- 
--#>- install-data-am: install-partDATA install-partrcDATA
--#>+ 1
--install-data-am: install-kde-icons  install-partDATA install-partrcDATA
-+#>- install-data-am: install-kde_moduleLTLIBRARIES install-partDATA \
-+#>- 	install-partrcDATA
-+#>+ 2
-+install-data-am: install-kde-icons   install-partDATA \
-+	install-partrcDATA
- 
--install-exec-am: install-libLTLIBRARIES
-+#>- install-exec-am:
-+#>+ 1
-+install-exec-am:  install-kde_moduleLTLIBRARIES
- 
- install-info: install-info-am
- 
-@@ -755,24 +758,24 @@
- 
- ps-am:
- 
--#>- uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-+#>- uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
- #>- 	uninstall-partDATA uninstall-partrcDATA
- #>+ 2
--uninstall-am: uninstall-kde-icons  uninstall-info-am uninstall-libLTLIBRARIES \
-+uninstall-am: uninstall-kde-icons  uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
- 	uninstall-partDATA uninstall-partrcDATA
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
--	clean-libLTLIBRARIES clean-libtool ctags distclean \
-+	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
- 	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am \
--	install-libLTLIBRARIES install-man install-partDATA \
-+	install-kde_moduleLTLIBRARIES install-man install-partDATA \
- 	install-partrcDATA install-strip installcheck installcheck-am \
- 	installdirs maintainer-clean maintainer-clean-generic \
- 	mostlyclean mostlyclean-compile mostlyclean-generic \
- 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
--	uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \
-+	uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
- 	uninstall-partDATA uninstall-partrcDATA
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
 --- kviewshell/Makefile.in
 +++ kviewshell/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- 
- 
- 
--SOURCES = $(emptymultipagepart_la_SOURCES) $(kviewerpart_la_SOURCES) $(libifaces_la_SOURCES) $(libkmultipage_la_SOURCES) $(libkviewshell_la_SOURCES) $(kviewshell_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -311,6 +309,9 @@
+@@ -309,6 +309,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16670,7 +14792,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +545,7 @@
+@@ -542,7 +545,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16679,7 +14801,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +583,9 @@
+@@ -580,9 +583,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16691,7 +14813,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1109,18 +1110,18 @@
+@@ -1107,18 +1110,18 @@
  mocs: emptyRenderer.moc
  
  #>+ 3
@@ -16716,7 +14838,7 @@
  
  #>+ 3
  documentRenderer.moc: $(srcdir)/documentRenderer.h
-@@ -1165,18 +1166,18 @@
+@@ -1163,18 +1166,18 @@
  mocs: zoom.moc
  
  #>+ 3
@@ -16741,7 +14863,7 @@
  
  #>+ 3
  empty_multipage.moc: $(srcdir)/empty_multipage.h
-@@ -1223,10 +1224,10 @@
+@@ -1221,10 +1224,10 @@
  
  #>+ 3
  clean-metasources:
@@ -16754,7 +14876,7 @@
  
  #>+ 4
  clean-idl:
-@@ -1254,16 +1255,16 @@
+@@ -1252,16 +1255,16 @@
  
  #>+ 13
  install-kde-icons:
@@ -16774,7 +14896,7 @@
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kviewshell.png
  
  #>+ 15
-@@ -1329,7 +1330,7 @@
+@@ -1327,7 +1330,7 @@
  	rm -f kviewerpart_la.all_cpp.final kviewerpart_la.all_cpp.files
  
  #>+ 11
@@ -16785,22 +14907,7 @@
  	echo "#define KDE_USE_FINAL 1" >> libkmultipage_la.all_cpp.final; \
 --- libkscan/Makefile.in
 +++ libkscan/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libkscan_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -269,6 +267,9 @@
+@@ -267,6 +267,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16810,7 +14917,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -481,7 +482,7 @@
+@@ -479,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16819,7 +14926,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -519,9 +520,9 @@
+@@ -517,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16833,12 +14940,6 @@
  	@$(NORMAL_INSTALL)
 --- libkscan/pics/Makefile.in
 +++ libkscan/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -197,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -16888,3 +14989,57 @@
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/palette_gray.png
  
  #>+ 15
+--- Makefile.in
++++ Makefile.in
+@@ -230,6 +230,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -430,7 +433,7 @@
+ .SUFFIXES:
+ am--refresh:
+ 	@:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -472,12 +475,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
+@@ -489,7 +492,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 $@
+@@ -912,7 +915,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdegraphics.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
+ 
+ #>+ 2
+ docs-am:




More information about the pkg-kde-commits mailing list