[Pkg-kde-commits] rev 1982 - branches/kde-3.4.0/packages/kdetoys/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sun Oct 16 18:18:13 UTC 2005


Author: chrsmrtn
Date: 2005-10-16 18:18:12 +0000 (Sun, 16 Oct 2005)
New Revision: 1982

Removed:
   branches/kde-3.4.0/packages/kdetoys/debian/patches/01_kdetoys_branch_r455845.diff
Modified:
   branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff
Log:
Branch update for kdetoys 3.4.3.


Deleted: branches/kde-3.4.0/packages/kdetoys/debian/patches/01_kdetoys_branch_r455845.diff

Modified: branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff	2005-10-16 18:12:04 UTC (rev 1981)
+++ branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff	2005-10-16 18:18:12 UTC (rev 1982)
@@ -101,7 +101,7 @@
    fi
  ])
  
-@@ -5799,6 +5787,7 @@
+@@ -5795,6 +5783,7 @@
  ## the same distribution terms that you use for the rest of that program.
  
  # serial 47 AC_PROG_LIBTOOL
@@ -109,7 +109,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5858,7 +5847,7 @@
+@@ -5854,7 +5843,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -118,7 +118,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6272,12 +6261,11 @@
+@@ -6268,12 +6257,11 @@
    if AC_TRY_EVAL(ac_compile); then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
@@ -132,7 +132,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6289,7 +6277,6 @@
+@@ -6285,7 +6273,6 @@
        esac
        ;;
      *64-bit*)
@@ -140,7 +140,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6419,7 +6406,7 @@
+@@ -6415,7 +6402,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -149,7 +149,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6448,20 +6435,26 @@
+@@ -6444,20 +6431,26 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -181,7 +181,7 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -6611,7 +6604,7 @@
+@@ -6607,7 +6600,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -190,7 +190,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6700,13 +6693,6 @@
+@@ -6696,13 +6689,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -204,7 +204,7 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -6730,8 +6716,11 @@
+@@ -6726,8 +6712,11 @@
       fi
     fi
     chmod u+w .
@@ -218,7 +218,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6848,7 +6837,7 @@
+@@ -6844,7 +6833,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -227,7 +227,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -6861,7 +6850,7 @@
+@@ -6857,7 +6846,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -236,7 +236,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -6871,7 +6860,20 @@
+@@ -6867,7 +6856,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -258,7 +258,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -6936,7 +6938,7 @@
+@@ -6932,7 +6934,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -267,7 +267,7 @@
    ;;
  
  beos*)
-@@ -6961,7 +6963,7 @@
+@@ -6957,7 +6959,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -276,7 +276,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7026,7 +7028,7 @@
+@@ -7022,7 +7024,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -285,7 +285,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7049,7 +7051,7 @@
+@@ -7045,7 +7047,7 @@
    dynamic_linker=no
    ;;
  
@@ -294,7 +294,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -7109,7 +7111,7 @@
+@@ -7105,7 +7107,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -303,7 +303,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7124,7 +7126,7 @@
+@@ -7120,7 +7122,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -312,7 +312,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7135,7 +7137,7 @@
+@@ -7131,7 +7133,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -321,7 +321,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7197,22 +7199,19 @@
+@@ -7193,22 +7195,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -350,7 +350,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -7222,6 +7221,30 @@
+@@ -7218,6 +7217,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -381,7 +381,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7231,7 +7254,7 @@
+@@ -7227,7 +7250,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -390,7 +390,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7260,7 +7283,7 @@
+@@ -7256,7 +7279,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -399,7 +399,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -7280,7 +7303,7 @@
+@@ -7276,7 +7299,7 @@
  
  os2*)
    libname_spec='$name'
@@ -408,7 +408,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7871,31 +7894,23 @@
+@@ -7867,31 +7890,23 @@
    ;;
  
  cygwin*)
@@ -449,7 +449,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -7934,42 +7949,21 @@
+@@ -7930,42 +7945,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -499,7 +499,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -7998,9 +7992,6 @@
+@@ -7994,9 +7988,6 @@
    ;;
  
  osf3* | osf4* | osf5*)
@@ -509,7 +509,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -8010,7 +8001,6 @@
+@@ -8006,7 +7997,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -517,7 +517,7 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8276,7 +8266,7 @@
+@@ -8272,7 +8262,7 @@
  fi
  if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
    AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -526,7 +526,7 @@
    else
      AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
      _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8326,7 +8316,7 @@
+@@ -8322,7 +8312,7 @@
    fi
    ;;
  
@@ -535,7 +535,7 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -8336,29 +8326,29 @@
+@@ -8332,29 +8322,29 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case "$host_os" in
      rhapsody* | darwin1.[[012]])
@@ -579,7 +579,7 @@
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8366,8 +8356,8 @@
+@@ -8362,8 +8352,8 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
    else
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -590,7 +590,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8475,8 +8465,8 @@
+@@ -8471,8 +8461,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -601,7 +601,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8502,7 +8492,7 @@
+@@ -8498,7 +8488,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -610,7 +610,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8532,8 +8522,22 @@
+@@ -8528,8 +8518,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -635,7 +635,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8579,15 +8583,16 @@
+@@ -8575,15 +8579,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -656,7 +656,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -8596,13 +8601,12 @@
+@@ -8592,13 +8597,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -672,7 +672,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8617,7 +8621,7 @@
+@@ -8613,7 +8617,7 @@
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
  	# This is similar to how AIX traditionally builds it's shared libraries.
@@ -681,7 +681,7 @@
        fi
      fi
      ;;
-@@ -8634,12 +8638,12 @@
+@@ -8630,12 +8634,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -696,7 +696,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8648,7 +8652,7 @@
+@@ -8644,7 +8648,7 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -705,7 +705,7 @@
      else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
      fi
-@@ -8659,20 +8663,20 @@
+@@ -8655,20 +8659,20 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case "$host_os" in
      rhapsody* | darwin1.[[012]])
@@ -736,7 +736,7 @@
        fi
        ;;
      esac
-@@ -8682,19 +8686,19 @@
+@@ -8678,19 +8682,19 @@
        lt_int_apple_cc_single_mod=yes
      fi
      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -762,7 +762,7 @@
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8729,7 +8733,7 @@
+@@ -8725,7 +8729,7 @@
    freebsd-elf*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
@@ -771,7 +771,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8751,7 +8755,7 @@
+@@ -8747,7 +8751,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
      aCC)
@@ -780,7 +780,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8760,11 +8764,11 @@
+@@ -8756,11 +8760,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
@@ -794,7 +794,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8821,7 +8825,7 @@
+@@ -8817,7 +8821,7 @@
  	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -803,7 +803,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -8842,7 +8846,7 @@
+@@ -8838,7 +8842,7 @@
  	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -812,7 +812,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -8857,7 +8861,7 @@
+@@ -8853,7 +8857,7 @@
      case $cc_basename in
        CC)
  	# SGI C++
@@ -821,7 +821,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -8868,9 +8872,9 @@
+@@ -8864,9 +8868,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -833,7 +833,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8887,8 +8891,8 @@
+@@ -8883,8 +8887,8 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -844,7 +844,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -8910,16 +8914,16 @@
+@@ -8906,16 +8910,16 @@
  	# Intel C++
  	with_gnu_ld=yes
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -865,7 +865,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8957,7 +8961,7 @@
+@@ -8953,7 +8957,7 @@
  	;;
      esac
      ;;
@@ -874,7 +874,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -8976,7 +8980,7 @@
+@@ -8972,7 +8976,7 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -883,7 +883,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8993,7 +8997,7 @@
+@@ -8989,7 +8993,7 @@
  	;;
        cxx)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -892,7 +892,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9011,7 +9015,7 @@
+@@ -9007,7 +9011,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -901,7 +901,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9036,7 +9040,7 @@
+@@ -9032,7 +9036,7 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -910,7 +910,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9052,10 +9056,10 @@
+@@ -9048,10 +9052,10 @@
  	;;
        cxx)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -923,7 +923,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9074,7 +9078,7 @@
+@@ -9070,7 +9074,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -932,7 +932,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9131,9 +9135,9 @@
+@@ -9127,9 +9131,9 @@
        CC)
  	# Sun C++ 4.2, 5.x and Centerline C++
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -944,7 +944,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9167,7 +9171,7 @@
+@@ -9163,7 +9167,7 @@
  	;;
        gcx)
  	# Green Hills C++ Compiler
@@ -953,7 +953,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9177,9 +9181,9 @@
+@@ -9173,9 +9177,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -965,7 +965,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9188,9 +9192,9 @@
+@@ -9184,9 +9188,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -977,7 +977,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9358,7 +9362,7 @@
+@@ -9354,7 +9358,7 @@
         fi
         ;;
  
@@ -986,7 +986,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9467,7 +9471,7 @@
+@@ -9463,7 +9467,7 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -995,7 +995,7 @@
    test "$enable_shared" = yes && enable_static=no
    ;;
  esac
-@@ -9609,11 +9613,12 @@
+@@ -9605,11 +9609,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -1010,7 +1010,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9663,7 +9668,7 @@
+@@ -9659,7 +9664,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1019,7 +1019,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9794,7 +9799,7 @@
+@@ -9790,7 +9795,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -1028,7 +1028,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -9825,7 +9830,7 @@
+@@ -9821,7 +9826,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -1037,7 +1037,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10069,7 +10074,10 @@
+@@ -10065,7 +10070,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -1049,7 +1049,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10142,7 +10150,7 @@
+@@ -10138,7 +10146,7 @@
    symcode='[[BCDEGQRST]]'
    ;;
  solaris* | sysv5*)
@@ -1058,7 +1058,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10160,7 +10168,7 @@
+@@ -10156,7 +10164,7 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -1067,7 +1067,7 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -10375,7 +10383,7 @@
+@@ -10371,7 +10379,7 @@
  	    ;;
  	esac
  	;;
@@ -1076,7 +1076,7 @@
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -10426,7 +10434,7 @@
+@@ -10422,7 +10430,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1085,7 +1085,7 @@
  	  cxx)
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10451,7 +10459,7 @@
+@@ -10447,7 +10455,7 @@
  	    ;;
  	esac
  	;;
@@ -1094,7 +1094,7 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -10762,6 +10770,9 @@
+@@ -10758,6 +10766,9 @@
    cygwin* | mingw*)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -1104,7 +1104,7 @@
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -10786,7 +10797,7 @@
+@@ -10782,7 +10793,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -1113,7 +1113,7 @@
    _LT_AC_TAGVAR(always_export_symbols, $1)=no
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10860,7 +10871,7 @@
+@@ -10856,7 +10867,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -1122,7 +1122,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10870,13 +10881,13 @@
+@@ -10866,13 +10877,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1138,7 +1138,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10885,19 +10896,19 @@
+@@ -10881,19 +10892,19 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -1162,7 +1162,7 @@
        fi
        ;;
  
-@@ -10915,8 +10926,8 @@
+@@ -10911,8 +10922,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1173,7 +1173,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10929,10 +10940,36 @@
+@@ -10925,10 +10936,36 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
@@ -1212,7 +1212,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10982,9 +11019,20 @@
+@@ -10978,9 +11015,20 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -1235,7 +1235,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11030,29 +11078,29 @@
+@@ -11026,29 +11074,29 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -1274,7 +1274,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11067,7 +11115,7 @@
+@@ -11063,7 +11111,7 @@
  	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
  	  # This is similar to how AIX traditionally builds it's shared libraries.
@@ -1283,7 +1283,7 @@
  	fi
        fi
        ;;
-@@ -11090,13 +11138,13 @@
+@@ -11086,13 +11134,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1300,7 +1300,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
        # FIXME: Should let the user specify the lib program.
-@@ -11110,21 +11158,21 @@
+@@ -11106,21 +11154,21 @@
        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
        case "$host_os" in
        rhapsody* | darwin1.[[012]])
@@ -1335,7 +1335,7 @@
  	;;
        esac
      	lt_int_apple_cc_single_mod=no
-@@ -11133,26 +11181,26 @@
+@@ -11129,26 +11177,26 @@
      	  lt_int_apple_cc_single_mod=yes
      	fi
      	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1370,7 +1370,7 @@
        ;;
  
      dgux*)
-@@ -11185,8 +11233,8 @@
+@@ -11181,8 +11229,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1381,7 +1381,7 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11194,7 +11242,7 @@
+@@ -11190,7 +11238,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -1390,7 +1390,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -11212,10 +11260,10 @@
+@@ -11208,10 +11256,10 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
  	case "$host_cpu" in
  	hppa*64*|ia64*)
@@ -1403,7 +1403,7 @@
  	  ;;
  	esac
        else
-@@ -11262,7 +11310,7 @@
+@@ -11258,7 +11306,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -1412,7 +1412,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11272,7 +11320,7 @@
+@@ -11268,7 +11316,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -1421,7 +1421,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11295,7 +11343,7 @@
+@@ -11291,7 +11339,7 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1430,7 +1430,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11305,7 +11353,7 @@
+@@ -11301,7 +11349,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -1439,7 +1439,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11316,14 +11364,14 @@
+@@ -11312,14 +11360,14 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1456,7 +1456,7 @@
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11335,7 +11383,7 @@
+@@ -11331,7 +11379,7 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1465,7 +1465,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11360,9 +11408,9 @@
+@@ -11356,9 +11404,9 @@
      solaris*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
        if test "$GCC" = yes; then
@@ -1477,7 +1477,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11382,7 +11430,7 @@
+@@ -11378,7 +11426,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -1486,7 +1486,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11442,9 +11490,9 @@
+@@ -11438,9 +11486,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -1498,7 +1498,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11502,7 +11550,7 @@
+@@ -11498,7 +11546,7 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1507,7 +1507,7 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -11661,8 +11709,8 @@
+@@ -11657,8 +11705,8 @@
      fi
    done
  done
@@ -1519,21 +1519,6 @@
  
 --- aclocal.m4
 +++ aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005  Free Software Foundation, Inc.
-@@ -28,7 +28,7 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.5])])
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
- 
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
 @@ -501,6 +501,35 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
@@ -1572,12 +1557,6 @@
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 --- amor/data/Makefile.in
 +++ amor/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@
- 
 @@ -186,6 +186,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -1611,12 +1590,6 @@
  mostlyclean-libtool:
 --- amor/data/pics/animated/blob/Makefile.in
 +++ amor/data/pics/animated/blob/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -1659,12 +1632,6 @@
  docs-am:
 --- amor/data/pics/animated/bonhomme/Makefile.in
 +++ amor/data/pics/animated/bonhomme/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -1707,12 +1674,6 @@
  docs-am:
 --- amor/data/pics/animated/eyes/Makefile.in
 +++ amor/data/pics/animated/eyes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -1755,12 +1716,6 @@
  docs-am:
 --- amor/data/pics/animated/ghost/Makefile.in
 +++ amor/data/pics/animated/ghost/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -1794,12 +1749,6 @@
  mostlyclean-libtool:
 --- amor/data/pics/animated/Makefile.in
 +++ amor/data/pics/animated/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -176,6 +176,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -1833,12 +1782,6 @@
  mostlyclean-libtool:
 --- amor/data/pics/animated/neko/Makefile.in
 +++ amor/data/pics/animated/neko/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -1881,12 +1824,6 @@
  docs-am:
 --- amor/data/pics/animated/pingu/Makefile.in
 +++ amor/data/pics/animated/pingu/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -1929,12 +1866,6 @@
  docs-am:
 --- amor/data/pics/animated/tao/Makefile.in
 +++ amor/data/pics/animated/tao/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -1977,12 +1908,6 @@
  docs-am:
 --- amor/data/pics/animated/worm/Makefile.in
 +++ amor/data/pics/animated/worm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -2025,12 +1950,6 @@
  docs-am:
 --- amor/data/pics/Makefile.in
 +++ amor/data/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@
- 
 @@ -176,6 +176,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -2064,12 +1983,6 @@
  mostlyclean-libtool:
 --- amor/data/pics/preview/Makefile.in
 +++ amor/data/pics/preview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -2103,12 +2016,6 @@
  mostlyclean-libtool:
 --- amor/data/pics/static/Makefile.in
 +++ amor/data/pics/static/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -2142,22 +2049,7 @@
  mostlyclean-libtool:
 --- amor/Makefile.in
 +++ amor/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(amor_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -233,6 +231,9 @@
+@@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2167,7 +2059,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -414,7 +415,7 @@
+@@ -412,7 +415,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2176,7 +2068,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -452,9 +453,9 @@
+@@ -450,9 +453,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2188,7 +2080,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -870,18 +871,18 @@
+@@ -868,18 +871,18 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub AmorIface.kidl
  
  #>+ 3
@@ -2213,7 +2105,7 @@
  
  #>+ 3
  amordialog.moc: $(srcdir)/amordialog.h
-@@ -899,7 +900,7 @@
+@@ -897,7 +900,7 @@
  
  #>+ 3
  clean-metasources:
@@ -2222,7 +2114,7 @@
  
  #>+ 2
  KDE_DIST=cr48-app-amor.png Makefile.in preparetips cr32-app-amor.png amor.desktop version.h cr16-app-amor.png configure.in.in Makefile.am 
-@@ -914,17 +915,17 @@
+@@ -912,17 +915,17 @@
  
  #>+ 13
  install-kde-icons:
@@ -2246,7 +2138,7 @@
  
  #>+ 15
  force-reedit:
-@@ -965,7 +966,7 @@
+@@ -963,7 +966,7 @@
  
  
  #>+ 11
@@ -2255,7 +2147,7 @@
  	@echo 'creating amor.all_cpp.cpp ...'; \
  	rm -f amor.all_cpp.files amor.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> amor.all_cpp.final; \
-@@ -1011,7 +1012,7 @@
+@@ -1009,7 +1012,7 @@
  nmcheck-am: nmcheck
  amordialog.lo: amordialog.moc 
  amorbubble.o: amorbubble.moc 
@@ -7739,7 +7631,7 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdetoys, "3.4.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdetoys, "3.4.3") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -7748,12 +7640,6 @@
  dnl generate the config header
 --- doc/amor/Makefile.in
 +++ doc/amor/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7824,12 +7710,6 @@
  
 --- doc/kmoon/Makefile.in
 +++ doc/kmoon/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7863,12 +7743,6 @@
  mostlyclean-libtool:
 --- doc/kodo/Makefile.in
 +++ doc/kodo/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -7935,12 +7809,6 @@
  
 --- doc/kteatime/Makefile.in
 +++ doc/kteatime/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8007,12 +7875,6 @@
  
 --- doc/kweather/Makefile.in
 +++ doc/kweather/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8046,12 +7908,6 @@
  mostlyclean-libtool:
 --- doc/kworldclock/Makefile.in
 +++ doc/kworldclock/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -160,6 +160,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8122,12 +7978,6 @@
  
 --- 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@
- 
 @@ -176,6 +176,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8168,22 +8018,7 @@
  mostlyclean-libtool:
 --- eyesapplet/Makefile.in
 +++ eyesapplet/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(eyes_panelapplet_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -207,6 +205,9 @@
+@@ -205,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8193,7 +8028,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -369,7 +370,7 @@
+@@ -367,7 +370,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8202,7 +8037,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -407,9 +408,9 @@
+@@ -405,9 +408,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8216,22 +8051,7 @@
  	@$(NORMAL_INSTALL)
 --- fifteenapplet/Makefile.in
 +++ fifteenapplet/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(fifteen_panelapplet_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -210,6 +208,9 @@
+@@ -208,6 +208,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8241,7 +8061,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -372,7 +373,7 @@
+@@ -370,7 +373,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8250,7 +8070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -410,9 +411,9 @@
+@@ -408,9 +411,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8264,22 +8084,7 @@
  	@$(NORMAL_INSTALL)
 --- kmoon/Makefile.in
 +++ kmoon/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kmoon_panelapplet_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -223,6 +221,9 @@
+@@ -221,6 +221,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8289,7 +8094,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -385,7 +386,7 @@
+@@ -383,7 +386,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8298,7 +8103,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -423,9 +424,9 @@
+@@ -421,9 +424,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8312,12 +8117,6 @@
  	@$(NORMAL_INSTALL)
 --- kmoon/pics/Makefile.in
 +++ kmoon/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@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8360,22 +8159,7 @@
  docs-am:
 --- kodo/Makefile.in
 +++ kodo/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kodo_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -212,6 +210,9 @@
+@@ -210,6 +210,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8385,7 +8169,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -377,7 +378,7 @@
+@@ -375,7 +378,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8394,7 +8178,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -415,9 +416,9 @@
+@@ -413,9 +416,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8406,7 +8190,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -731,24 +732,24 @@
+@@ -729,24 +732,24 @@
  	-rm -f  kimagenumber.moc kodometer.moc
  
  #>+ 2
@@ -8440,22 +8224,7 @@
  force-reedit:
 --- kteatime/Makefile.in
 +++ kteatime/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kteatime_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -210,6 +208,9 @@
+@@ -208,6 +208,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8465,7 +8234,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -376,7 +377,7 @@
+@@ -374,7 +377,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8474,7 +8243,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -414,9 +415,9 @@
+@@ -412,9 +415,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8486,7 +8255,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -731,7 +732,7 @@
+@@ -729,7 +732,7 @@
  	-rm -f  timeedit.moc toplevel.moc
  
  #>+ 2
@@ -8495,7 +8264,7 @@
  
  #>+ 2
  docs-am:
-@@ -744,29 +745,29 @@
+@@ -742,29 +745,29 @@
  	$(INSTALL_DATA) $(srcdir)/cr32-app-kteatime.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kteatime.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/cr16-app-kteatime.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kteatime.png
@@ -8533,22 +8302,7 @@
  force-reedit:
 --- ktux/Makefile.in
 +++ ktux/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(ktux_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -227,6 +225,9 @@
+@@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8558,7 +8312,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -404,7 +405,7 @@
+@@ -402,7 +405,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8567,7 +8321,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -442,9 +443,9 @@
+@@ -440,9 +443,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8581,12 +8335,6 @@
  	@$(NORMAL_INSTALL)
 --- ktux/sprites/Makefile.in
 +++ ktux/sprites/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8629,12 +8377,6 @@
  docs-am:
 --- kweather/graphics/Makefile.in
 +++ kweather/graphics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8677,41 +8419,7 @@
  docs-am:
 --- kweather/Makefile.in
 +++ kweather/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,10 +17,6 @@
- 
- 
- 
--#>- SOURCES = $(kcm_weather_la_SOURCES) $(kcm_weatherservice_la_SOURCES) $(kweatherreport_la_SOURCES) $(weather_panelapplet_la_SOURCES) $(kweatherservice_SOURCES) $(metar_parser_test_SOURCES) $(stationdatabase_test_SOURCES) $(sun_test_SOURCES)
--#>+ 1
--SOURCES = $(kcm_weather_la_SOURCES) $(kcm_weatherservice_la_SOURCES) $(kweatherreport_la_SOURCES) $(weather_panelapplet_la_SOURCES) $(kweatherservice_SOURCES) $(metar_parser_test_SOURCES) $(stationdatabase_test_SOURCES) $(sun_test_SOURCES) $(kweatherreport_SOURCES) 
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -178,10 +174,15 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kcm_weather_la_SOURCES) $(kcm_weatherservice_la_SOURCES) \
-+#>- 	$(kweatherreport_la_SOURCES) $(weather_panelapplet_la_SOURCES) \
-+#>- 	$(kweatherservice_SOURCES) $(metar_parser_test_SOURCES) \
-+#>- 	$(stationdatabase_test_SOURCES) $(sun_test_SOURCES)
-+#>+ 4
- SOURCES = $(kcm_weather_la_SOURCES) $(kcm_weatherservice_la_SOURCES) \
- 	$(kweatherreport_la_SOURCES) $(weather_panelapplet_la_SOURCES) \
- 	$(kweatherservice_SOURCES) $(metar_parser_test_SOURCES) \
--	$(stationdatabase_test_SOURCES) $(sun_test_SOURCES)
-+	$(stationdatabase_test_SOURCES) $(sun_test_SOURCES) $(kweatherreport_SOURCES) 
- #>- DIST_SOURCES = $(kcm_weather_la_SOURCES) \
- #>- 	$(kcm_weatherservice_la_SOURCES) $(kweatherreport_la_SOURCES) \
- #>- 	$(weather_panelapplet_la_SOURCES) $(kweatherservice_SOURCES) \
-@@ -327,6 +328,9 @@
+@@ -328,6 +328,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8721,7 +8429,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -569,7 +573,7 @@
+@@ -570,7 +573,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8730,7 +8438,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +611,9 @@
+@@ -608,9 +611,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8742,7 +8450,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1272,13 +1276,6 @@
+@@ -1274,13 +1277,6 @@
  mocs: kcmweather.moc
  
  #>+ 3
@@ -8756,7 +8464,7 @@
  weatherlib.moc: $(srcdir)/weatherlib.h
  	$(MOC) $(srcdir)/weatherlib.h -o weatherlib.moc
  
-@@ -1286,11 +1283,11 @@
+@@ -1288,11 +1284,11 @@
  mocs: weatherlib.moc
  
  #>+ 3
@@ -8771,7 +8479,7 @@
  
  #>+ 3
  kcmweatherservice.moc: $(srcdir)/kcmweatherservice.h
-@@ -1300,18 +1297,18 @@
+@@ -1302,18 +1298,18 @@
  mocs: kcmweatherservice.moc
  
  #>+ 3
@@ -8796,7 +8504,7 @@
  
  #>+ 3
  reportview.moc: $(srcdir)/reportview.h
-@@ -1321,6 +1318,13 @@
+@@ -1323,6 +1319,13 @@
  mocs: reportview.moc
  
  #>+ 3
@@ -8810,7 +8518,7 @@
  sidebarwidget.moc: $(srcdir)/sidebarwidget.h
  	$(MOC) $(srcdir)/sidebarwidget.h -o sidebarwidget.moc
  
-@@ -1366,10 +1370,10 @@
+@@ -1368,10 +1371,10 @@
  
  #>+ 3
  clean-metasources:
@@ -8823,7 +8531,7 @@
  
  #>+ 10
  clean-idl:
-@@ -1484,7 +1488,7 @@
+@@ -1486,7 +1489,7 @@
  	rm -f kcm_weatherservice_la.all_cpp.final kcm_weatherservice_la.all_cpp.files
  
  #>+ 11
@@ -8832,7 +8540,7 @@
  	@echo 'creating weather_panelapplet_la.all_cpp.cpp ...'; \
  	rm -f weather_panelapplet_la.all_cpp.files weather_panelapplet_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> weather_panelapplet_la.all_cpp.final; \
-@@ -1496,7 +1500,7 @@
+@@ -1498,7 +1501,7 @@
  	rm -f weather_panelapplet_la.all_cpp.final weather_panelapplet_la.all_cpp.files
  
  #>+ 11
@@ -8843,22 +8551,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kweatherservice.all_cpp.final; \
 --- kworldwatch/Makefile.in
 +++ kworldwatch/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libww_la_SOURCES) $(ww_panelapplet_la_SOURCES) $(kworldclock_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -255,6 +253,9 @@
+@@ -253,6 +253,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8868,7 +8561,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -431,7 +432,7 @@
+@@ -429,7 +432,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -8877,7 +8570,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
  
@@ -8889,7 +8582,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1047,17 +1048,17 @@
+@@ -1045,17 +1048,17 @@
  
  #>+ 13
  install-kde-icons:
@@ -8912,12 +8605,6 @@
  force-reedit:
 --- kworldwatch/maps/depths/Makefile.in
 +++ kworldwatch/maps/depths/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8951,12 +8638,6 @@
  mostlyclean-libtool:
 --- kworldwatch/maps/flatworld/Makefile.in
 +++ kworldwatch/maps/flatworld/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8990,12 +8671,6 @@
  mostlyclean-libtool:
 --- kworldwatch/maps/Makefile.in
 +++ kworldwatch/maps/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -176,6 +176,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9029,12 +8704,6 @@
  mostlyclean-libtool:
 --- kworldwatch/pics/Makefile.in
 +++ kworldwatch/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@
- 
 @@ -170,6 +170,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9068,12 +8737,6 @@
  mostlyclean-libtool:
 --- Makefile.in
 +++ Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -193,6 +193,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9121,7 +8784,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdetoys.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
+-KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdetoys.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 kdetoys.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
  
  #>+ 2




More information about the pkg-kde-commits mailing list