rev 3781 - trunk/packages/koffice/debian/patches
Isaac Clerencia
isaac at costa.debian.org
Mon May 15 23:41:43 UTC 2006
Author: isaac
Date: 2006-05-15 23:41:36 +0000 (Mon, 15 May 2006)
New Revision: 3781
Modified:
trunk/packages/koffice/debian/patches/98_buildprep.diff
Log:
Update buidprep for koffice 1.5.1
Modified: trunk/packages/koffice/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/koffice/debian/patches/98_buildprep.diff 2006-05-15 22:56:29 UTC (rev 3780)
+++ trunk/packages/koffice/debian/patches/98_buildprep.diff 2006-05-15 23:41:36 UTC (rev 3781)
@@ -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: 483858 $
- # @configure_input@
-
-@@ -267,6 +267,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@
-@@ -565,7 +568,7 @@
- .SUFFIXES:
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -607,12 +610,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
-@@ -624,7 +627,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 $@
-@@ -1134,7 +1137,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=koffice.lsm Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs changes-1.4-beta1 aclocal.m4 Doxyfile.temp configure.in.in Makefile.am acinclude.m4 changes-1.5 Makefile.am.in
-+KDE_DIST=koffice.lsm stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs changes-1.4-beta1 aclocal.m4 Doxyfile.temp configure.in.in acinclude.m4 configure Makefile.am changes-1.5 Makefile.am.in
-
- #>+ 2
- docs-am:
--- acinclude.m4
+++ acinclude.m4
@@ -1689,15 +1689,6 @@
@@ -88,7 +28,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5970,30 +5958,15 @@
+@@ -5973,30 +5961,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -124,7 +64,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6053,7 +6026,7 @@
+@@ -6056,7 +6029,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -133,7 +73,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6103,7 +6076,7 @@
+@@ -6106,7 +6079,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -142,7 +82,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6123,7 +6096,7 @@
+@@ -6126,7 +6099,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -151,7 +91,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6143,6 +6116,7 @@
+@@ -6146,6 +6119,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -159,7 +99,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -6162,15 +6136,17 @@
+@@ -6165,15 +6139,17 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -179,7 +119,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6211,11 +6187,56 @@
+@@ -6214,11 +6190,56 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -236,7 +176,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6288,15 +6309,15 @@
+@@ -6291,15 +6312,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -255,7 +195,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6465,14 +6486,13 @@
+@@ -6468,14 +6489,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -272,7 +212,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6484,7 +6504,6 @@
+@@ -6487,7 +6507,6 @@
esac
;;
*64-bit*)
@@ -280,7 +220,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6518,6 +6537,22 @@
+@@ -6521,6 +6540,22 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -303,7 +243,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6549,7 +6584,7 @@
+@@ -6552,7 +6587,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -312,7 +252,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6559,8 +6594,10 @@
+@@ -6562,8 +6597,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -325,7 +265,7 @@
$2=yes
fi
fi
-@@ -6586,11 +6623,16 @@
+@@ -6589,11 +6626,16 @@
LDFLAGS="$LDFLAGS $3"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -343,7 +283,7 @@
else
$2=yes
fi
-@@ -6614,7 +6656,7 @@
+@@ -6617,7 +6659,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -352,7 +292,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6643,20 +6685,70 @@
+@@ -6646,20 +6688,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -429,7 +369,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.
-@@ -6673,7 +6765,7 @@
+@@ -6676,7 +6768,7 @@
# _LT_AC_CHECK_DLFCN
@@ -438,7 +378,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -6681,7 +6773,7 @@
+@@ -6684,7 +6776,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -447,7 +387,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -6747,17 +6839,19 @@
+@@ -6750,17 +6842,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -469,7 +409,7 @@
esac
else :
# compilation failed
-@@ -6769,7 +6863,7 @@
+@@ -6772,7 +6866,7 @@
# AC_LIBTOOL_DLOPEN_SELF
@@ -478,7 +418,7 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -6806,7 +6900,7 @@
+@@ -6809,7 +6903,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -487,7 +427,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6840,7 +6934,7 @@
+@@ -6843,7 +6937,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -496,7 +436,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6853,7 +6947,7 @@
+@@ -6856,7 +6950,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -505,7 +445,7 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -6895,20 +6989,13 @@
+@@ -6898,20 +6992,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -527,7 +467,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6920,13 +7007,18 @@
+@@ -6923,13 +7010,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -550,7 +490,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6985,8 +7077,8 @@
+@@ -6988,8 +7080,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -561,7 +501,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7043,7 +7135,7 @@
+@@ -7046,7 +7138,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -570,7 +510,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -7056,7 +7148,7 @@
+@@ -7059,7 +7151,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -579,7 +519,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7066,7 +7158,20 @@
+@@ -7069,7 +7161,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -601,7 +541,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7131,7 +7236,7 @@
+@@ -7134,7 +7239,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -610,7 +550,7 @@
;;
beos*)
-@@ -7140,7 +7245,7 @@
+@@ -7143,7 +7248,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -619,7 +559,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7156,7 +7261,7 @@
+@@ -7159,7 +7264,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -628,7 +568,7 @@
need_version=no
need_lib_prefix=no
-@@ -7168,7 +7273,8 @@
+@@ -7171,7 +7276,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -638,7 +578,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7198,7 +7304,7 @@
+@@ -7201,7 +7307,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -647,7 +587,7 @@
;;
esac
;;
-@@ -7221,7 +7327,7 @@
+@@ -7224,7 +7330,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -656,7 +596,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"`
-@@ -7244,7 +7350,7 @@
+@@ -7247,7 +7353,7 @@
dynamic_linker=no
;;
@@ -665,7 +605,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7256,8 +7362,17 @@
+@@ -7259,8 +7365,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -685,7 +625,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7275,14 +7390,19 @@
+@@ -7278,14 +7393,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -707,7 +647,7 @@
esac
;;
-@@ -7302,9 +7422,9 @@
+@@ -7305,9 +7425,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -719,7 +659,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7319,7 +7439,7 @@
+@@ -7322,7 +7442,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -728,7 +668,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7330,7 +7450,7 @@
+@@ -7333,7 +7453,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -737,7 +677,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7342,6 +7462,18 @@
+@@ -7345,6 +7465,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -756,7 +696,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -7392,22 +7524,19 @@
+@@ -7395,22 +7527,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'
@@ -785,7 +725,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,
-@@ -7417,6 +7546,30 @@
+@@ -7420,6 +7549,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -816,7 +756,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7426,7 +7579,7 @@
+@@ -7429,7 +7582,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -825,7 +765,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7454,8 +7607,13 @@
+@@ -7457,8 +7610,13 @@
openbsd*)
version_type=sunos
@@ -840,7 +780,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
-@@ -7475,7 +7633,7 @@
+@@ -7478,7 +7636,7 @@
os2*)
libname_spec='$name'
@@ -849,7 +789,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7493,13 +7651,6 @@
+@@ -7496,13 +7654,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -863,7 +803,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -7525,7 +7676,7 @@
+@@ -7528,7 +7679,7 @@
need_version=yes
;;
@@ -872,7 +812,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -7558,6 +7709,29 @@
+@@ -7561,6 +7712,29 @@
fi
;;
@@ -902,7 +842,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7571,6 +7745,11 @@
+@@ -7574,6 +7748,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -914,7 +854,7 @@
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-@@ -7595,6 +7774,9 @@
+@@ -7598,6 +7777,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -924,7 +864,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -7621,7 +7803,9 @@
+@@ -7624,7 +7806,9 @@
case $tagname in
CXX)
@@ -935,7 +875,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7683,7 +7867,7 @@
+@@ -7686,7 +7870,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -944,7 +884,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7721,7 +7905,7 @@
+@@ -7724,7 +7908,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -953,7 +893,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -7857,7 +8041,7 @@
+@@ -7860,7 +8044,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -962,7 +902,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -7967,7 +8151,7 @@
+@@ -7970,7 +8154,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -971,7 +911,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -7999,7 +8183,7 @@
+@@ -8002,7 +8186,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -980,7 +920,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -8026,6 +8210,15 @@
+@@ -8029,6 +8213,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -996,7 +936,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -8059,44 +8252,36 @@
+@@ -8062,44 +8255,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1052,7 +992,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8112,7 +8297,7 @@
+@@ -8115,7 +8300,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -1061,7 +1001,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -8128,43 +8313,27 @@
+@@ -8131,43 +8316,27 @@
esac
;;
@@ -1117,7 +1057,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
-@@ -8183,32 +8352,22 @@
+@@ -8186,32 +8355,22 @@
;;
openbsd*)
@@ -1153,7 +1093,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -8229,10 +8388,13 @@
+@@ -8232,10 +8391,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1168,7 +1108,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -8252,36 +8414,43 @@
+@@ -8255,36 +8417,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1236,7 +1176,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -8313,13 +8482,13 @@
+@@ -8316,13 +8485,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1257,7 +1197,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8338,13 +8507,13 @@
+@@ -8341,13 +8510,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1278,7 +1218,7 @@
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8382,10 +8551,21 @@
+@@ -8385,10 +8554,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1301,7 +1241,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8425,7 +8605,7 @@
+@@ -8428,7 +8608,7 @@
# AC_LIBTOOL_RC
@@ -1310,7 +1250,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -8458,36 +8638,9 @@
+@@ -8461,36 +8641,9 @@
_LT_AC_SYS_COMPILER
@@ -1350,7 +1290,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -8501,9 +8654,9 @@
+@@ -8504,9 +8657,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1362,7 +1302,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -8512,7 +8665,7 @@
+@@ -8515,7 +8668,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1371,7 +1311,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8521,48 +8674,11 @@
+@@ -8524,48 +8677,11 @@
fi
;;
@@ -1422,7 +1362,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8587,7 +8703,7 @@
+@@ -8590,7 +8706,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1431,7 +1371,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8599,6 +8715,7 @@
+@@ -8602,6 +8718,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1439,7 +1379,7 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8616,7 +8733,7 @@
+@@ -8619,7 +8736,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1448,7 +1388,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8626,11 +8743,15 @@
+@@ -8629,11 +8746,15 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -1465,7 +1405,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8641,18 +8762,18 @@
+@@ -8644,18 +8765,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1487,7 +1427,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8670,8 +8791,8 @@
+@@ -8673,8 +8794,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
@@ -1498,7 +1438,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8697,7 +8818,7 @@
+@@ -8700,7 +8821,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.
@@ -1507,7 +1447,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8727,8 +8848,23 @@
+@@ -8730,8 +8851,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1533,7 +1473,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8745,7 +8881,7 @@
+@@ -8748,7 +8884,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1542,7 +1482,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -8764,8 +8900,12 @@
+@@ -8767,8 +8903,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1555,7 +1495,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8774,15 +8914,16 @@
+@@ -8777,15 +8917,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1576,7 +1516,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.
-@@ -8791,13 +8932,12 @@
+@@ -8794,13 +8935,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1592,7 +1532,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8806,21 +8946,31 @@
+@@ -8809,21 +8949,31 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1634,7 +1574,7 @@
;;
esac
;;
-@@ -8829,12 +8979,12 @@
+@@ -8832,12 +8982,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'
@@ -1649,7 +1589,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
-@@ -8843,70 +8993,81 @@
+@@ -8846,70 +8996,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1783,7 +1723,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8917,14 +9078,14 @@
+@@ -8920,14 +9081,14 @@
;;
esac
;;
@@ -1800,7 +1740,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8941,12 +9102,12 @@
+@@ -8944,12 +9105,12 @@
# location of the library.
case $cc_basename in
@@ -1816,7 +1756,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8955,11 +9116,11 @@
+@@ -8958,11 +9119,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.
@@ -1830,7 +1770,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8969,33 +9130,22 @@
+@@ -8972,33 +9133,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1871,7 +1811,7 @@
;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -9006,17 +9156,20 @@
+@@ -9009,17 +9159,20 @@
esac
case $cc_basename in
@@ -1898,7 +1838,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -9032,12 +9185,15 @@
+@@ -9035,12 +9188,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1918,7 +1858,7 @@
;;
esac
fi
-@@ -9048,11 +9204,25 @@
+@@ -9051,11 +9207,25 @@
;;
esac
;;
@@ -1946,7 +1886,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9063,9 +9233,9 @@
+@@ -9066,9 +9236,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1958,7 +1898,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9076,14 +9246,14 @@
+@@ -9079,14 +9249,14 @@
;;
linux*)
case $cc_basename in
@@ -1976,7 +1916,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -9101,20 +9271,44 @@
+@@ -9104,20 +9274,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2027,7 +1967,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9142,7 +9336,7 @@
+@@ -9145,7 +9339,7 @@
;;
mvs*)
case $cc_basename in
@@ -2036,7 +1976,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9152,7 +9346,7 @@
+@@ -9155,7 +9349,7 @@
;;
esac
;;
@@ -2045,7 +1985,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=
-@@ -9163,15 +9357,31 @@
+@@ -9166,15 +9360,31 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -2079,7 +2019,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9181,14 +9391,14 @@
+@@ -9184,14 +9394,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2097,7 +2037,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9206,7 +9416,7 @@
+@@ -9209,7 +9419,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2106,7 +2046,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9225,13 +9435,13 @@
+@@ -9228,13 +9438,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -2122,7 +2062,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9240,17 +9450,17 @@
+@@ -9243,17 +9453,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2144,7 +2084,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9269,7 +9479,7 @@
+@@ -9272,7 +9482,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2153,7 +2093,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9290,27 +9500,14 @@
+@@ -9293,27 +9503,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2183,7 +2123,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9323,36 +9520,33 @@
+@@ -9326,36 +9523,33 @@
;;
solaris*)
case $cc_basename in
@@ -2232,7 +2172,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9360,9 +9554,9 @@
+@@ -9363,9 +9557,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2244,7 +2184,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9372,9 +9566,9 @@
+@@ -9375,9 +9569,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
@@ -2256,7 +2196,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9383,9 +9577,9 @@
+@@ -9386,9 +9580,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2268,7 +2208,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9398,12 +9592,63 @@
+@@ -9401,12 +9595,63 @@
;;
esac
;;
@@ -2334,7 +2274,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9440,8 +9685,6 @@
+@@ -9443,8 +9688,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2343,7 +2283,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9459,7 +9702,7 @@
+@@ -9462,7 +9705,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2352,7 +2292,7 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -9513,7 +9756,7 @@
+@@ -9516,7 +9759,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -2361,7 +2301,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9553,7 +9796,7 @@
+@@ -9556,7 +9799,7 @@
fi
;;
@@ -2370,7 +2310,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9589,13 +9832,37 @@
+@@ -9592,13 +9835,37 @@
$rm -f confest.$objext
@@ -2409,7 +2349,7 @@
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9639,12 +9906,16 @@
+@@ -9642,12 +9909,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2427,7 +2367,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9654,7 +9925,7 @@
+@@ -9657,7 +9928,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2436,7 +2376,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9662,8 +9933,10 @@
+@@ -9665,8 +9936,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2449,7 +2389,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9673,8 +9946,6 @@
+@@ -9676,8 +9949,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2458,7 +2398,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -9684,8 +9955,6 @@
+@@ -9687,8 +9958,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2467,7 +2407,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9714,20 +9983,27 @@
+@@ -9717,20 +9986,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -2496,7 +2436,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -9739,8 +10015,6 @@
+@@ -9742,8 +10018,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2505,7 +2445,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9750,7 +10024,7 @@
+@@ -9753,7 +10027,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2514,7 +2454,7 @@
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9774,11 +10048,16 @@
+@@ -9777,11 +10051,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2531,7 +2471,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9804,11 +10083,12 @@
+@@ -9807,11 +10086,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2546,7 +2486,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 \
-@@ -9858,7 +10138,7 @@
+@@ -9861,7 +10141,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2555,7 +2495,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9924,11 +10204,11 @@
+@@ -9927,11 +10207,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2569,7 +2509,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9959,6 +10239,12 @@
+@@ -9962,6 +10242,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2582,7 +2522,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9970,6 +10256,9 @@
+@@ -9973,6 +10259,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2592,7 +2532,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -9989,7 +10278,7 @@
+@@ -9992,7 +10281,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2601,7 +2541,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -10020,7 +10309,7 @@
+@@ -10023,7 +10312,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2610,7 +2550,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10035,7 +10324,7 @@
+@@ -10038,7 +10327,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2619,7 +2559,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10264,7 +10553,10 @@
+@@ -10267,7 +10556,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.
@@ -2631,7 +2571,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10306,9 +10598,6 @@
+@@ -10309,9 +10601,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2641,7 +2581,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -10330,14 +10619,30 @@
+@@ -10333,14 +10622,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -2674,7 +2614,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10355,14 +10660,17 @@
+@@ -10358,14 +10663,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2694,7 +2634,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10518,6 +10826,10 @@
+@@ -10521,6 +10829,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2705,7 +2645,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10526,7 +10838,7 @@
+@@ -10529,7 +10841,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2714,7 +2654,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10551,18 +10863,28 @@
+@@ -10554,18 +10866,28 @@
;;
chorus*)
case $cc_basename in
@@ -2746,7 +2686,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10570,22 +10892,22 @@
+@@ -10573,22 +10895,22 @@
;;
esac
;;
@@ -2775,7 +2715,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10598,9 +10920,13 @@
+@@ -10601,9 +10923,13 @@
;;
esac
;;
@@ -2790,7 +2730,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -10611,18 +10937,24 @@
+@@ -10614,18 +10940,24 @@
;;
linux*)
case $cc_basename in
@@ -2819,7 +2759,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10639,25 +10971,25 @@
+@@ -10642,25 +10974,25 @@
;;
mvs*)
case $cc_basename in
@@ -2850,7 +2790,7 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10671,24 +11003,15 @@
+@@ -10674,24 +11006,15 @@
;;
psos*)
;;
@@ -2877,7 +2817,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10698,12 +11021,12 @@
+@@ -10701,12 +11024,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2892,7 +2832,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10713,7 +11036,7 @@
+@@ -10716,7 +11039,7 @@
;;
tandem*)
case $cc_basename in
@@ -2901,7 +2841,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10721,7 +11044,14 @@
+@@ -10724,7 +11047,14 @@
;;
esac
;;
@@ -2917,7 +2857,7 @@
;;
vxworks*)
;;
-@@ -10768,6 +11098,11 @@
+@@ -10771,6 +11101,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -2929,7 +2869,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -10784,7 +11119,7 @@
+@@ -10787,7 +11122,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2938,7 +2878,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10810,6 +11145,16 @@
+@@ -10813,6 +11148,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2955,7 +2895,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10821,7 +11166,7 @@
+@@ -10824,7 +11169,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2964,7 +2904,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10845,12 +11190,19 @@
+@@ -10848,12 +11193,19 @@
;;
linux*)
@@ -2985,7 +2925,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10865,15 +11217,15 @@
+@@ -10868,15 +11220,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -3007,7 +2947,7 @@
;;
sunos4*)
-@@ -10882,7 +11234,7 @@
+@@ -10885,7 +11237,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -3016,7 +2956,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)='-Bstatic'
-@@ -10895,6 +11247,17 @@
+@@ -10898,6 +11250,17 @@
fi
;;
@@ -3034,7 +2974,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10922,7 +11285,7 @@
+@@ -10925,7 +11288,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -3043,7 +2983,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10931,6 +11294,16 @@
+@@ -10934,6 +11297,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -3060,7 +3000,7 @@
])
-@@ -10955,7 +11328,13 @@
+@@ -10958,7 +11331,13 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3075,7 +3015,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10981,7 +11360,7 @@
+@@ -10984,7 +11363,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -3084,7 +3024,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*
-@@ -10998,7 +11377,8 @@
+@@ -11001,7 +11380,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -3094,7 +3034,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11008,6 +11388,10 @@
+@@ -11011,6 +11391,10 @@
with_gnu_ld=no
fi
;;
@@ -3105,7 +3045,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -11018,6 +11402,27 @@
+@@ -11021,6 +11405,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3133,7 +3073,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -11055,7 +11460,7 @@
+@@ -11058,7 +11463,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
@@ -3142,7 +3082,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11065,13 +11470,13 @@
+@@ -11068,13 +11473,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'
@@ -3159,7 +3099,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
-@@ -11080,23 +11485,70 @@
+@@ -11083,23 +11488,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3236,7 +3176,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -11110,13 +11562,40 @@
+@@ -11113,13 +11565,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3279,7 +3219,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -11126,24 +11605,19 @@
+@@ -11129,24 +11608,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3311,7 +3251,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11155,7 +11629,7 @@
+@@ -11158,7 +11632,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3320,7 +3260,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11177,9 +11651,21 @@
+@@ -11180,9 +11654,21 @@
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
@@ -3344,7 +3284,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11196,7 +11682,7 @@
+@@ -11199,7 +11685,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3353,7 +3293,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -11215,8 +11701,12 @@
+@@ -11218,8 +11704,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3366,7 +3306,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11224,30 +11714,30 @@
+@@ -11227,30 +11717,30 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3408,7 +3348,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11256,13 +11746,11 @@
+@@ -11259,13 +11749,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3425,7 +3365,7 @@
fi
fi
;;
-@@ -11275,7 +11763,7 @@
+@@ -11278,7 +11766,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3434,7 +3374,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11285,69 +11773,69 @@
+@@ -11288,69 +11776,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3550,7 +3490,7 @@
;;
dgux*)
-@@ -11380,16 +11868,25 @@
+@@ -11383,16 +11871,25 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3579,7 +3519,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
-@@ -11403,47 +11900,62 @@
+@@ -11406,47 +11903,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3666,7 +3606,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -11457,7 +11969,7 @@
+@@ -11460,7 +11972,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3675,7 +3615,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'
-@@ -11467,7 +11979,7 @@
+@@ -11470,7 +11982,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -3684,7 +3624,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
-@@ -11490,7 +12002,8 @@
+@@ -11493,7 +12005,8 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3694,7 +3634,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11500,7 +12013,7 @@
+@@ -11503,7 +12016,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -3703,7 +3643,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11511,14 +12024,14 @@
+@@ -11514,14 +12027,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
@@ -3720,7 +3660,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'
-@@ -11530,13 +12043,13 @@
+@@ -11533,13 +12046,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3736,7 +3676,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11544,21 +12057,15 @@
+@@ -11547,21 +12060,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -3762,7 +3702,7 @@
_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~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11567,8 +12074,18 @@
+@@ -11570,8 +12077,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3783,7 +3723,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11577,7 +12094,7 @@
+@@ -11580,7 +12097,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.
@@ -3792,7 +3732,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11625,36 +12142,45 @@
+@@ -11628,36 +12145,45 @@
fi
;;
@@ -3859,7 +3799,7 @@
;;
uts4*)
-@@ -11672,11 +12198,6 @@
+@@ -11675,11 +12201,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -3871,7 +3811,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -11697,13 +12218,14 @@
+@@ -11700,13 +12221,14 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3887,7 +3827,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -11831,7 +12353,7 @@
+@@ -11834,7 +12356,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3914,7 +3854,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -3923,7 +3863,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3960,8 +3900,8 @@
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde351_compatibility_TRUE need_kde351_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE include_tiff_filter_TRUE include_tiff_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_INCDIR PG_LIBDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE compile_kexi_reports_plugin_TRUE compile_kexi_reports_plugin_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_LIBDIR RUBY_LIBRUBYARG RUBY_ENABLESHARED compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde351_compatibility_TRUE need_kde351_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE include_tiff_filter_TRUE include_tiff_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_INCDIR PG_LIBDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE compile_kexi_reports_plugin_TRUE compile_kexi_reports_plugin_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_LIBDIR RUBY_LIBRUBYARG RUBY_ENABLESHARED compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde351_compatibility_TRUE need_kde351_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE include_tiff_filter_TRUE include_tiff_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_INCDIR PG_LIBDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE compile_kexi_reports_plugin_TRUE compile_kexi_reports_plugin_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_INCLUDEDIR RUBY_LIBDIR RUBY_LIBRUBYARG RUBY_ENABLESHARED compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde351_compatibility_TRUE need_kde351_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE include_tiff_filter_TRUE include_tiff_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_INCDIR PG_LIBDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE compile_kexi_reports_plugin_TRUE compile_kexi_reports_plugin_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_INCLUDEDIR RUBY_LIBDIR RUBY_LIBRUBYARG RUBY_ENABLESHARED compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -4190,7 +4130,7 @@
fi
-@@ -7189,7 +7039,7 @@
+@@ -7192,7 +7042,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -4199,7 +4139,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7294,7 +7144,7 @@
+@@ -7297,7 +7147,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -4208,7 +4148,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -7328,7 +7178,7 @@
+@@ -7331,7 +7181,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4217,7 +4157,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7358,6 +7208,15 @@
+@@ -7361,6 +7211,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -4233,7 +4173,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7368,36 +7227,43 @@
+@@ -7371,36 +7230,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -4301,7 +4241,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
-@@ -7444,44 +7310,36 @@
+@@ -7447,44 +7313,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -4356,7 +4296,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7497,7 +7355,7 @@
+@@ -7500,7 +7358,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -4365,7 +4305,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7513,43 +7371,27 @@
+@@ -7516,43 +7374,27 @@
esac
;;
@@ -4421,7 +4361,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
-@@ -7568,32 +7410,22 @@
+@@ -7571,32 +7413,22 @@
;;
openbsd*)
@@ -4457,7 +4397,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7614,10 +7446,13 @@
+@@ -7617,10 +7449,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4472,7 +4412,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -7633,6 +7468,9 @@
+@@ -7636,6 +7471,9 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -4482,16 +4422,16 @@
# Allow CC to be a program name with arguments.
compiler=$CC
-@@ -7667,7 +7505,7 @@
+@@ -7670,7 +7508,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7670 "configure"' > conftest.$ac_ext
-+ echo '#line 7508 "configure"' > conftest.$ac_ext
+- echo '#line 7673 "configure"' > conftest.$ac_ext
++ echo '#line 7511 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7710,14 +7548,13 @@
+@@ -7713,14 +7551,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -4508,7 +4448,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7729,7 +7566,6 @@
+@@ -7732,7 +7569,6 @@
esac
;;
*64-bit*)
@@ -4516,7 +4456,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7824,6 +7660,26 @@
+@@ -7827,6 +7663,26 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -4543,7 +4483,7 @@
esac
-@@ -8216,6 +8072,243 @@
+@@ -8219,6 +8075,243 @@
done
@@ -4787,16 +4727,16 @@
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8308,7 +8401,7 @@
+@@ -8311,7 +8404,7 @@
# Provide some information about the compiler.
--echo "$as_me:8311:" \
-+echo "$as_me:8404:" \
+-echo "$as_me:8314:" \
++echo "$as_me:8407:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8461,7 +8554,7 @@
+@@ -8464,7 +8557,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4805,7 +4745,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8490,20 +8583,70 @@
+@@ -8493,20 +8586,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4882,7 +4822,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.
-@@ -8540,9 +8683,6 @@
+@@ -8543,9 +8686,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4892,7 +4832,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -8564,14 +8704,30 @@
+@@ -8567,14 +8707,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -4925,7 +4865,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8589,14 +8745,17 @@
+@@ -8592,14 +8748,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4945,7 +4885,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8758,7 +8917,7 @@
+@@ -8761,7 +8920,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4954,7 +4894,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8778,7 +8937,7 @@
+@@ -8781,7 +8940,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4963,7 +4903,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -9035,6 +9194,7 @@
+@@ -9038,6 +9197,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -4971,7 +4911,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9054,15 +9214,26 @@
+@@ -9057,15 +9217,26 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -5000,7 +4940,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -9088,7 +9259,7 @@
+@@ -9091,7 +9262,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -5009,7 +4949,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9150,7 +9321,7 @@
+@@ -9153,7 +9324,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -5018,7 +4958,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9245,68 +9416,25 @@
+@@ -9248,68 +9419,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -5102,7 +5042,7 @@
## CAVEAT EMPTOR:
-@@ -9335,18 +9463,20 @@
+@@ -9338,18 +9466,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -5110,13 +5050,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9341: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9469: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9344: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9472: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9345: \$? = $ac_status" >&5
-+ echo "$as_me:9473: \$? = $ac_status" >&5
+- echo "$as_me:9348: \$? = $ac_status" >&5
++ echo "$as_me:9476: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -5128,7 +5068,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9407,6 +9537,11 @@
+@@ -9410,6 +9540,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -5140,7 +5080,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9423,7 +9558,7 @@
+@@ -9426,7 +9561,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -5149,7 +5089,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9449,6 +9584,16 @@
+@@ -9452,6 +9587,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -5166,7 +5106,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9460,7 +9605,7 @@
+@@ -9463,7 +9608,7 @@
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -5175,7 +5115,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9484,12 +9629,19 @@
+@@ -9487,12 +9632,19 @@
;;
linux*)
@@ -5196,7 +5136,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9504,15 +9656,15 @@
+@@ -9507,15 +9659,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -5218,7 +5158,7 @@
;;
sunos4*)
-@@ -9521,7 +9673,7 @@
+@@ -9524,7 +9676,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -5227,7 +5167,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9534,6 +9686,17 @@
+@@ -9537,6 +9689,17 @@
fi
;;
@@ -5245,7 +5185,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9568,18 +9731,20 @@
+@@ -9571,18 +9734,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -5253,13 +5193,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9574: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9737: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9577: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9740: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9578: \$? = $ac_status" >&5
-+ echo "$as_me:9741: \$? = $ac_status" >&5
+- echo "$as_me:9581: \$? = $ac_status" >&5
++ echo "$as_me:9744: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -5271,7 +5211,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9600,7 +9765,7 @@
+@@ -9603,7 +9768,7 @@
fi
fi
@@ -5280,7 +5220,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9610,6 +9775,48 @@
+@@ -9613,6 +9778,48 @@
;;
esac
@@ -5329,7 +5269,7 @@
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-@@ -9622,38 +9829,36 @@
+@@ -9625,38 +9832,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5350,13 +5290,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9641: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9841: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9644: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9844: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9645: \$? = $ac_status" >&5
-+ echo "$as_me:9845: \$? = $ac_status" >&5
+- echo "$as_me:9648: \$? = $ac_status" >&5
++ echo "$as_me:9848: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -5380,7 +5320,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9724,6 +9929,16 @@
+@@ -9727,6 +9932,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -5397,7 +5337,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9734,6 +9949,10 @@
+@@ -9737,6 +9952,10 @@
with_gnu_ld=no
fi
;;
@@ -5408,7 +5348,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9744,6 +9963,27 @@
+@@ -9747,6 +9966,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -5436,7 +5376,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9781,7 +10021,7 @@
+@@ -9784,7 +10024,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5445,7 +5385,7 @@
else
ld_shlibs=no
fi
-@@ -9791,13 +10031,13 @@
+@@ -9794,13 +10034,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -5462,7 +5402,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9806,23 +10046,70 @@
+@@ -9809,23 +10049,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5538,7 +5478,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9836,13 +10123,40 @@
+@@ -9839,13 +10126,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5581,7 +5521,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9852,24 +10166,19 @@
+@@ -9855,24 +10169,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5613,7 +5553,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9881,7 +10190,7 @@
+@@ -9884,7 +10193,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -5622,7 +5562,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9903,9 +10212,21 @@
+@@ -9906,9 +10215,21 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -5646,7 +5586,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9922,7 +10243,7 @@
+@@ -9925,7 +10246,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -5655,7 +5595,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -9941,8 +10262,12 @@
+@@ -9944,8 +10265,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -5668,7 +5608,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9950,22 +10275,23 @@
+@@ -9953,22 +10278,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -5699,7 +5639,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10016,14 +10342,13 @@
+@@ -10019,14 +10345,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5717,7 +5657,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10082,13 +10407,11 @@
+@@ -10085,13 +10410,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -5734,7 +5674,7 @@
fi
fi
;;
-@@ -10101,7 +10424,7 @@
+@@ -10104,7 +10427,7 @@
ld_shlibs=no
;;
@@ -5743,7 +5683,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10111,13 +10434,13 @@
+@@ -10114,13 +10437,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -5760,7 +5700,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -10127,52 +10450,52 @@
+@@ -10130,52 +10453,52 @@
;;
darwin* | rhapsody*)
@@ -5853,7 +5793,7 @@
fi
;;
-@@ -10206,16 +10529,25 @@
+@@ -10209,16 +10532,25 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5882,7 +5822,7 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -10229,47 +10561,62 @@
+@@ -10232,47 +10564,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -5969,7 +5909,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10283,7 +10630,7 @@
+@@ -10286,7 +10633,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5978,7 +5918,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10293,7 +10640,7 @@
+@@ -10296,7 +10643,7 @@
link_all_deplibs=yes
;;
@@ -5987,7 +5927,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10316,7 +10663,8 @@
+@@ -10319,7 +10666,8 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -5997,7 +5937,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10326,7 +10674,7 @@
+@@ -10329,7 +10677,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -6006,7 +5946,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10337,14 +10685,14 @@
+@@ -10340,14 +10688,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -6023,7 +5963,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10356,13 +10704,13 @@
+@@ -10359,13 +10707,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6039,7 +5979,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10370,21 +10718,15 @@
+@@ -10373,21 +10721,15 @@
hardcode_libdir_separator=:
;;
@@ -6065,7 +6005,7 @@
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10393,8 +10735,18 @@
+@@ -10396,8 +10738,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -6086,7 +6026,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10403,7 +10755,7 @@
+@@ -10406,7 +10758,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.
@@ -6095,7 +6035,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10451,36 +10803,45 @@
+@@ -10454,36 +10806,45 @@
fi
;;
@@ -6162,7 +6102,7 @@
;;
uts4*)
-@@ -10499,11 +10860,6 @@
+@@ -10502,11 +10863,6 @@
echo "${ECHO_T}$ld_shlibs" >&6
test "$ld_shlibs" = no && can_build_shared=no
@@ -6174,7 +6114,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10536,6 +10892,7 @@
+@@ -10539,6 +10895,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -6182,7 +6122,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10571,7 +10928,7 @@
+@@ -10574,7 +10931,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6191,7 +6131,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10581,7 +10938,20 @@
+@@ -10584,7 +10941,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6213,7 +6153,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10646,7 +11016,7 @@
+@@ -10649,7 +11019,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6222,7 +6162,7 @@
;;
beos*)
-@@ -10655,7 +11025,7 @@
+@@ -10658,7 +11028,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6231,7 +6171,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10671,7 +11041,7 @@
+@@ -10674,7 +11044,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6240,7 +6180,7 @@
need_version=no
need_lib_prefix=no
-@@ -10683,7 +11053,8 @@
+@@ -10686,7 +11056,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6250,7 +6190,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10713,7 +11084,7 @@
+@@ -10716,7 +11087,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6259,7 +6199,7 @@
;;
esac
;;
-@@ -10736,7 +11107,7 @@
+@@ -10739,7 +11110,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6268,7 +6208,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"`
-@@ -10759,7 +11130,7 @@
+@@ -10762,7 +11133,7 @@
dynamic_linker=no
;;
@@ -6277,7 +6217,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10771,8 +11142,17 @@
+@@ -10774,8 +11145,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -6297,7 +6237,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10790,14 +11170,19 @@
+@@ -10793,14 +11173,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6319,7 +6259,7 @@
esac
;;
-@@ -10817,9 +11202,9 @@
+@@ -10820,9 +11205,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6331,7 +6271,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10834,7 +11219,7 @@
+@@ -10837,7 +11222,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6340,7 +6280,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10845,7 +11230,7 @@
+@@ -10848,7 +11233,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6349,7 +6289,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10857,6 +11242,18 @@
+@@ -10860,6 +11245,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -6368,7 +6308,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10907,22 +11304,19 @@
+@@ -10910,22 +11307,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'
@@ -6397,7 +6337,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,
-@@ -10932,6 +11326,30 @@
+@@ -10935,6 +11329,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6428,7 +6368,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10941,7 +11359,7 @@
+@@ -10944,7 +11362,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6437,7 +6377,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10969,8 +11387,13 @@
+@@ -10972,8 +11390,13 @@
openbsd*)
version_type=sunos
@@ -6452,7 +6392,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
-@@ -10990,7 +11413,7 @@
+@@ -10993,7 +11416,7 @@
os2*)
libname_spec='$name'
@@ -6461,7 +6401,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11008,13 +11431,6 @@
+@@ -11011,13 +11434,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -6475,7 +6415,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11040,7 +11456,7 @@
+@@ -11043,7 +11459,7 @@
need_version=yes
;;
@@ -6484,7 +6424,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11073,6 +11489,29 @@
+@@ -11076,6 +11492,29 @@
fi
;;
@@ -6514,7 +6454,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11088,12 +11527,17 @@
+@@ -11091,12 +11530,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
@@ -6534,7 +6474,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11736,7 +12180,7 @@
+@@ -11739,7 +12183,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -6543,16 +6483,16 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -11752,7 +12196,7 @@
+@@ -11755,7 +12199,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11755 "configure"
-+#line 12199 "configure"
+-#line 11758 "configure"
++#line 12202 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11809,6 +12253,8 @@
+@@ -11812,6 +12256,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -6561,7 +6501,7 @@
exit (status);
}
-@@ -11818,12 +12264,12 @@
+@@ -11821,12 +12267,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6576,7 +6516,7 @@
esac
else :
# compilation failed
-@@ -11838,7 +12284,7 @@
+@@ -11841,7 +12287,7 @@
echo "${ECHO_T}$lt_cv_dlopen_self" >&6
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -6585,16 +6525,16 @@
echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
if test "${lt_cv_dlopen_self_static+set}" = set; then
-@@ -11850,7 +12296,7 @@
+@@ -11853,7 +12299,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11853 "configure"
-+#line 12299 "configure"
+-#line 11856 "configure"
++#line 12302 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11907,6 +12353,8 @@
+@@ -11910,6 +12356,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -6603,7 +6543,7 @@
exit (status);
}
-@@ -11916,12 +12364,12 @@
+@@ -11919,12 +12367,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6618,7 +6558,7 @@
esac
else :
# compilation failed
-@@ -11954,7 +12402,7 @@
+@@ -11957,7 +12405,7 @@
fi
@@ -6627,7 +6567,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -11966,7 +12414,7 @@
+@@ -11969,7 +12417,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -6636,7 +6576,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11975,47 +12423,10 @@
+@@ -11978,47 +12426,10 @@
fi
;;
@@ -6685,7 +6625,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -12041,7 +12452,8 @@
+@@ -12044,7 +12455,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -6695,7 +6635,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 \
-@@ -12155,11 +12567,11 @@
+@@ -12158,11 +12570,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -6709,7 +6649,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12189,6 +12601,12 @@
+@@ -12192,6 +12604,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -6722,7 +6662,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12200,6 +12618,9 @@
+@@ -12203,6 +12621,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -6732,7 +6672,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12219,7 +12640,7 @@
+@@ -12222,7 +12643,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6741,7 +6681,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12250,7 +12671,7 @@
+@@ -12253,7 +12674,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6750,7 +6690,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12265,7 +12686,7 @@
+@@ -12268,7 +12689,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -6759,7 +6699,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12492,7 +12913,10 @@
+@@ -12495,7 +12916,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.
@@ -6771,7 +6711,7 @@
fi
-@@ -12527,6 +12951,9 @@
+@@ -12530,6 +12954,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -6781,7 +6721,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12557,7 +12984,9 @@
+@@ -12560,7 +12987,9 @@
case $tagname in
CXX)
@@ -6792,7 +6732,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12577,6 +13006,7 @@
+@@ -12580,6 +13009,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -6800,7 +6740,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12594,7 +13024,7 @@
+@@ -12597,7 +13027,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -6809,7 +6749,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12604,17 +13034,34 @@
+@@ -12607,17 +13037,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -6845,7 +6785,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12625,18 +13072,27 @@
+@@ -12628,18 +13075,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -6876,7 +6816,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12707,7 +13163,7 @@
+@@ -12710,7 +13166,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -6885,7 +6825,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -12741,7 +13197,7 @@
+@@ -12744,7 +13200,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6894,7 +6834,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12760,8 +13216,8 @@
+@@ -12763,8 +13219,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
@@ -6905,7 +6845,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12787,7 +13243,7 @@
+@@ -12790,7 +13246,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.
@@ -6914,7 +6854,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12818,8 +13274,23 @@
+@@ -12821,8 +13277,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -6940,7 +6880,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12836,7 +13307,7 @@
+@@ -12839,7 +13310,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -6949,7 +6889,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -12855,8 +13326,12 @@
+@@ -12858,8 +13329,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -6962,7 +6902,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12865,15 +13340,16 @@
+@@ -12868,15 +13343,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -6983,7 +6923,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.
-@@ -12932,13 +13408,12 @@
+@@ -12935,13 +13411,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -6999,7 +6939,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12997,16 +13472,26 @@
+@@ -13000,16 +13475,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -7031,7 +6971,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13020,12 +13505,12 @@
+@@ -13023,12 +13508,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -7046,7 +6986,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -13034,70 +13519,81 @@
+@@ -13037,70 +13522,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7180,7 +7120,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13108,14 +13604,14 @@
+@@ -13111,14 +13607,14 @@
;;
esac
;;
@@ -7197,7 +7137,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13132,12 +13628,12 @@
+@@ -13135,12 +13631,12 @@
# location of the library.
case $cc_basename in
@@ -7213,7 +7153,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13146,11 +13642,11 @@
+@@ -13149,11 +13645,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.
@@ -7227,7 +7167,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13160,33 +13656,22 @@
+@@ -13163,33 +13659,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -7268,7 +7208,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13197,17 +13682,20 @@
+@@ -13200,17 +13685,20 @@
esac
case $cc_basename in
@@ -7295,7 +7235,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13223,12 +13711,15 @@
+@@ -13226,12 +13714,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -7315,7 +7255,7 @@
;;
esac
fi
-@@ -13239,11 +13730,25 @@
+@@ -13242,11 +13733,25 @@
;;
esac
;;
@@ -7343,7 +7283,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13254,9 +13759,9 @@
+@@ -13257,9 +13762,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -7355,7 +7295,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13267,14 +13772,14 @@
+@@ -13270,14 +13775,14 @@
;;
linux*)
case $cc_basename in
@@ -7373,7 +7313,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13292,20 +13797,44 @@
+@@ -13295,20 +13800,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -7424,7 +7364,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13333,7 +13862,7 @@
+@@ -13336,7 +13865,7 @@
;;
mvs*)
case $cc_basename in
@@ -7433,7 +7373,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13343,7 +13872,7 @@
+@@ -13346,7 +13875,7 @@
;;
esac
;;
@@ -7442,7 +7382,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13354,15 +13883,31 @@
+@@ -13357,15 +13886,31 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -7476,7 +7416,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13372,14 +13917,14 @@
+@@ -13375,14 +13920,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -7494,7 +7434,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13397,7 +13942,7 @@
+@@ -13400,7 +13945,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7503,7 +7443,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13416,13 +13961,13 @@
+@@ -13419,13 +13964,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -7519,7 +7459,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13431,17 +13976,17 @@
+@@ -13434,17 +13979,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -7541,7 +7481,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13460,7 +14005,7 @@
+@@ -13463,7 +14008,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7550,7 +7490,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13481,27 +14026,14 @@
+@@ -13484,27 +14029,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -7580,7 +7520,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13514,36 +14046,33 @@
+@@ -13517,36 +14049,33 @@
;;
solaris*)
case $cc_basename in
@@ -7629,7 +7569,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13551,9 +14080,9 @@
+@@ -13554,9 +14083,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -7641,7 +7581,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13563,9 +14092,9 @@
+@@ -13566,9 +14095,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -7653,7 +7593,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13574,9 +14103,9 @@
+@@ -13577,9 +14106,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -7665,7 +7605,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13589,12 +14118,63 @@
+@@ -13592,12 +14121,63 @@
;;
esac
;;
@@ -7731,7 +7671,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13651,7 +14231,7 @@
+@@ -13654,7 +14234,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -7740,7 +7680,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13691,7 +14271,7 @@
+@@ -13694,7 +14274,7 @@
fi
;;
@@ -7749,7 +7689,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13727,6 +14307,29 @@
+@@ -13730,6 +14310,29 @@
$rm -f confest.$objext
@@ -7779,7 +7719,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13774,6 +14377,10 @@
+@@ -13777,6 +14380,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -7790,7 +7730,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13782,7 +14389,7 @@
+@@ -13785,7 +14392,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7799,7 +7739,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13807,18 +14414,28 @@
+@@ -13810,18 +14417,28 @@
;;
chorus*)
case $cc_basename in
@@ -7831,7 +7771,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13826,22 +14443,22 @@
+@@ -13829,22 +14446,22 @@
;;
esac
;;
@@ -7860,7 +7800,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13854,9 +14471,13 @@
+@@ -13857,9 +14474,13 @@
;;
esac
;;
@@ -7875,7 +7815,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13867,18 +14488,24 @@
+@@ -13870,18 +14491,24 @@
;;
linux*)
case $cc_basename in
@@ -7903,7 +7843,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13895,25 +14522,25 @@
+@@ -13898,25 +14525,25 @@
;;
mvs*)
case $cc_basename in
@@ -7934,7 +7874,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13927,24 +14554,15 @@
+@@ -13930,24 +14557,15 @@
;;
psos*)
;;
@@ -7961,7 +7901,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13954,12 +14572,12 @@
+@@ -13957,12 +14575,12 @@
;;
sunos4*)
case $cc_basename in
@@ -7976,7 +7916,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13969,7 +14587,7 @@
+@@ -13972,7 +14590,7 @@
;;
tandem*)
case $cc_basename in
@@ -7985,7 +7925,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13977,7 +14595,14 @@
+@@ -13980,7 +14598,14 @@
;;
esac
;;
@@ -8001,7 +7941,7 @@
;;
vxworks*)
;;
-@@ -14010,18 +14635,20 @@
+@@ -14013,18 +14638,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8009,13 +7949,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14016: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14641: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14019: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14644: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14020: \$? = $ac_status" >&5
-+ echo "$as_me:14645: \$? = $ac_status" >&5
+- echo "$as_me:14023: \$? = $ac_status" >&5
++ echo "$as_me:14648: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -8027,7 +7967,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -14042,7 +14669,7 @@
+@@ -14045,7 +14672,7 @@
fi
fi
@@ -8036,7 +7976,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14052,11 +14679,53 @@
+@@ -14055,11 +14682,53 @@
;;
esac
@@ -8095,7 +8035,7 @@
lt_cv_prog_compiler_c_o_CXX=no
$rm -r conftest 2>/dev/null
mkdir conftest
-@@ -14064,38 +14733,36 @@
+@@ -14067,38 +14736,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8116,13 +8056,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14083: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14745: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14086: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14748: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14087: \$? = $ac_status" >&5
-+ echo "$as_me:14749: \$? = $ac_status" >&5
+- echo "$as_me:14090: \$? = $ac_status" >&5
++ echo "$as_me:14752: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8146,7 +8086,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14145,7 +14812,13 @@
+@@ -14148,7 +14815,13 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -8161,7 +8101,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14156,11 +14829,6 @@
+@@ -14159,11 +14832,6 @@
echo "${ECHO_T}$ld_shlibs_CXX" >&6
test "$ld_shlibs_CXX" = no && can_build_shared=no
@@ -8173,7 +8113,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14193,6 +14861,7 @@
+@@ -14196,6 +14864,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -8181,7 +8121,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14228,7 +14897,7 @@
+@@ -14231,7 +14900,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8190,7 +8130,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14238,7 +14907,20 @@
+@@ -14241,7 +14910,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8212,7 +8152,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14303,7 +14985,7 @@
+@@ -14306,7 +14988,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8221,7 +8161,7 @@
;;
beos*)
-@@ -14312,7 +14994,7 @@
+@@ -14315,7 +14997,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8230,7 +8170,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14328,7 +15010,7 @@
+@@ -14331,7 +15013,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8239,7 +8179,7 @@
need_version=no
need_lib_prefix=no
-@@ -14340,7 +15022,8 @@
+@@ -14343,7 +15025,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8249,7 +8189,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14370,7 +15053,7 @@
+@@ -14373,7 +15056,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8258,7 +8198,7 @@
;;
esac
;;
-@@ -14393,7 +15076,7 @@
+@@ -14396,7 +15079,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8267,7 +8207,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"`
-@@ -14416,7 +15099,7 @@
+@@ -14419,7 +15102,7 @@
dynamic_linker=no
;;
@@ -8276,7 +8216,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14428,8 +15111,17 @@
+@@ -14431,8 +15114,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8296,7 +8236,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14447,14 +15139,19 @@
+@@ -14450,14 +15142,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8318,7 +8258,7 @@
esac
;;
-@@ -14474,9 +15171,9 @@
+@@ -14477,9 +15174,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8330,7 +8270,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14491,7 +15188,7 @@
+@@ -14494,7 +15191,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8339,7 +8279,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14502,7 +15199,7 @@
+@@ -14505,7 +15202,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8348,7 +8288,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14514,6 +15211,18 @@
+@@ -14517,6 +15214,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -8367,7 +8307,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14564,22 +15273,19 @@
+@@ -14567,22 +15276,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'
@@ -8396,7 +8336,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,
-@@ -14589,6 +15295,30 @@
+@@ -14592,6 +15298,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8427,7 +8367,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14598,7 +15328,7 @@
+@@ -14601,7 +15331,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8436,7 +8376,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14626,8 +15356,13 @@
+@@ -14629,8 +15359,13 @@
openbsd*)
version_type=sunos
@@ -8451,7 +8391,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
-@@ -14647,7 +15382,7 @@
+@@ -14650,7 +15385,7 @@
os2*)
libname_spec='$name'
@@ -8460,7 +8400,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14665,13 +15400,6 @@
+@@ -14668,13 +15403,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -8474,7 +8414,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14697,7 +15425,7 @@
+@@ -14700,7 +15428,7 @@
need_version=yes
;;
@@ -8483,7 +8423,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14730,6 +15458,29 @@
+@@ -14733,6 +15461,29 @@
fi
;;
@@ -8513,7 +8453,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14745,12 +15496,17 @@
+@@ -14748,12 +15499,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
@@ -8533,7 +8473,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14782,1111 +15538,293 @@
+@@ -14785,1111 +15541,293 @@
enable_fast_install=needless
fi
@@ -9345,7 +9285,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15412 "configure"
+-#line 15415 "configure"
-#include "confdefs.h"
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
@@ -9474,7 +9414,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15510 "configure"
+-#line 15513 "configure"
-#include "confdefs.h"
+# Dependencies to place before the objects being linked to create a
+# shared library.
@@ -9869,7 +9809,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-@@ -16002,7 +15940,10 @@
+@@ -16005,7 +15943,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.
@@ -9881,7 +9821,7 @@
fi
-@@ -16074,16 +16015,42 @@
+@@ -16077,16 +16018,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -9925,7 +9865,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -16096,7 +16063,7 @@
+@@ -16099,7 +16066,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -9934,7 +9874,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16104,8 +16071,10 @@
+@@ -16107,8 +16074,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -9947,7 +9887,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16118,8 +16087,6 @@
+@@ -16121,8 +16090,6 @@
echo "$as_me:$LINENO: result: $enable_static" >&5
echo "${ECHO_T}$enable_static" >&6
@@ -9956,7 +9896,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16166,6 +16133,11 @@
+@@ -16169,6 +16136,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -9968,7 +9908,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16182,7 +16154,7 @@
+@@ -16185,7 +16157,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -9977,7 +9917,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16208,6 +16180,16 @@
+@@ -16211,6 +16183,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -9994,7 +9934,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16219,7 +16201,7 @@
+@@ -16222,7 +16204,7 @@
lt_prog_compiler_wl_F77='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -10003,7 +9943,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16243,12 +16225,19 @@
+@@ -16246,12 +16228,19 @@
;;
linux*)
@@ -10024,7 +9964,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16263,15 +16252,15 @@
+@@ -16266,15 +16255,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -10046,7 +9986,7 @@
;;
sunos4*)
-@@ -16280,7 +16269,7 @@
+@@ -16283,7 +16272,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -10055,7 +9995,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16293,6 +16282,17 @@
+@@ -16296,6 +16285,17 @@
fi
;;
@@ -10073,7 +10013,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16327,7 +16327,7 @@
+@@ -16330,7 +16330,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -10081,9 +10021,9 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16333: $lt_compile\"" >&5)
-@@ -16337,8 +16337,10 @@
- echo "$as_me:16337: \$? = $ac_status" >&5
+ (eval echo "\"\$as_me:16336: $lt_compile\"" >&5)
+@@ -16340,8 +16340,10 @@
+ echo "$as_me:16340: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -10095,7 +10035,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16359,7 +16361,7 @@
+@@ -16362,7 +16364,7 @@
fi
fi
@@ -10104,7 +10044,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16369,6 +16371,48 @@
+@@ -16372,6 +16374,48 @@
;;
esac
@@ -10153,7 +10093,7 @@
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-@@ -16381,38 +16425,36 @@
+@@ -16384,38 +16428,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -10174,13 +10114,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16400: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16437: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16403: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16440: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16404: \$? = $ac_status" >&5
-+ echo "$as_me:16441: \$? = $ac_status" >&5
+- echo "$as_me:16407: \$? = $ac_status" >&5
++ echo "$as_me:16444: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10204,7 +10144,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16483,6 +16525,16 @@
+@@ -16486,6 +16528,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -10221,7 +10161,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16493,6 +16545,10 @@
+@@ -16496,6 +16548,10 @@
with_gnu_ld=no
fi
;;
@@ -10232,7 +10172,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16503,6 +16559,27 @@
+@@ -16506,6 +16562,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -10260,7 +10200,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16540,7 +16617,7 @@
+@@ -16543,7 +16620,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -10269,7 +10209,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16550,13 +16627,13 @@
+@@ -16553,13 +16630,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -10286,7 +10226,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16565,23 +16642,70 @@
+@@ -16568,23 +16645,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -10363,7 +10303,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16595,13 +16719,40 @@
+@@ -16598,13 +16722,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10406,7 +10346,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16611,24 +16762,19 @@
+@@ -16614,24 +16765,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10438,7 +10378,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16640,7 +16786,7 @@
+@@ -16643,7 +16789,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -10447,7 +10387,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16662,9 +16808,21 @@
+@@ -16665,9 +16811,21 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -10471,7 +10411,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16681,7 +16839,7 @@
+@@ -16684,7 +16842,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -10480,7 +10420,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -16700,8 +16858,12 @@
+@@ -16703,8 +16861,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -10493,7 +10433,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16709,22 +16871,23 @@
+@@ -16712,22 +16874,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -10524,7 +10464,7 @@
program main
end
-@@ -16765,14 +16928,13 @@
+@@ -16768,14 +16931,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -10542,7 +10482,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16821,13 +16983,11 @@
+@@ -16824,13 +16986,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -10559,7 +10499,7 @@
fi
fi
;;
-@@ -16840,7 +17000,7 @@
+@@ -16843,7 +17003,7 @@
ld_shlibs_F77=no
;;
@@ -10568,7 +10508,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16850,68 +17010,68 @@
+@@ -16853,68 +17013,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -10681,7 +10621,7 @@
fi
;;
-@@ -16945,16 +17105,25 @@
+@@ -16948,16 +17108,25 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -10710,7 +10650,7 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -16968,47 +17137,62 @@
+@@ -16971,47 +17140,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -10797,7 +10737,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17022,7 +17206,7 @@
+@@ -17025,7 +17209,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -10806,7 +10746,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -17032,7 +17216,7 @@
+@@ -17035,7 +17219,7 @@
link_all_deplibs_F77=yes
;;
@@ -10815,7 +10755,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -17055,7 +17239,8 @@
+@@ -17058,7 +17242,8 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -10825,7 +10765,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17065,7 +17250,7 @@
+@@ -17068,7 +17253,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -10834,7 +10774,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17076,14 +17261,14 @@
+@@ -17079,14 +17264,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -10851,7 +10791,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -17095,13 +17280,13 @@
+@@ -17098,13 +17283,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -10867,7 +10807,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17109,21 +17294,15 @@
+@@ -17112,21 +17297,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -10893,7 +10833,7 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17132,8 +17311,18 @@
+@@ -17135,8 +17314,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -10914,7 +10854,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17142,7 +17331,7 @@
+@@ -17145,7 +17334,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.
@@ -10923,7 +10863,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17190,36 +17379,45 @@
+@@ -17193,36 +17382,45 @@
fi
;;
@@ -10990,7 +10930,7 @@
;;
uts4*)
-@@ -17238,11 +17436,6 @@
+@@ -17241,11 +17439,6 @@
echo "${ECHO_T}$ld_shlibs_F77" >&6
test "$ld_shlibs_F77" = no && can_build_shared=no
@@ -11002,7 +10942,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17275,6 +17468,7 @@
+@@ -17278,6 +17471,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -11010,7 +10950,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17310,7 +17504,7 @@
+@@ -17313,7 +17507,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -11019,7 +10959,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17320,7 +17514,20 @@
+@@ -17323,7 +17517,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -11041,7 +10981,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17385,7 +17592,7 @@
+@@ -17388,7 +17595,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11050,7 +10990,7 @@
;;
beos*)
-@@ -17394,7 +17601,7 @@
+@@ -17397,7 +17604,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -11059,7 +10999,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17410,7 +17617,7 @@
+@@ -17413,7 +17620,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -11068,7 +11008,7 @@
need_version=no
need_lib_prefix=no
-@@ -17422,7 +17629,8 @@
+@@ -17425,7 +17632,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -11078,7 +11018,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17452,7 +17660,7 @@
+@@ -17455,7 +17663,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -11087,7 +11027,7 @@
;;
esac
;;
-@@ -17475,7 +17683,7 @@
+@@ -17478,7 +17686,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -11096,7 +11036,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"`
-@@ -17498,7 +17706,7 @@
+@@ -17501,7 +17709,7 @@
dynamic_linker=no
;;
@@ -11105,7 +11045,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17510,8 +17718,17 @@
+@@ -17513,8 +17721,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -11125,7 +11065,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17529,14 +17746,19 @@
+@@ -17532,14 +17749,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -11147,7 +11087,7 @@
esac
;;
-@@ -17556,9 +17778,9 @@
+@@ -17559,9 +17781,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -11159,7 +11099,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17573,7 +17795,7 @@
+@@ -17576,7 +17798,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -11168,7 +11108,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17584,7 +17806,7 @@
+@@ -17587,7 +17809,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -11177,7 +11117,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17596,6 +17818,18 @@
+@@ -17599,6 +17821,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -11196,7 +11136,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17646,22 +17880,19 @@
+@@ -17649,22 +17883,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'
@@ -11225,7 +11165,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,
-@@ -17671,6 +17902,30 @@
+@@ -17674,6 +17905,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11256,7 +11196,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17680,7 +17935,7 @@
+@@ -17683,7 +17938,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -11265,7 +11205,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17708,8 +17963,13 @@
+@@ -17711,8 +17966,13 @@
openbsd*)
version_type=sunos
@@ -11280,7 +11220,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
-@@ -17729,7 +17989,7 @@
+@@ -17732,7 +17992,7 @@
os2*)
libname_spec='$name'
@@ -11289,7 +11229,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17747,13 +18007,6 @@
+@@ -17750,13 +18010,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -11303,7 +11243,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17779,7 +18032,7 @@
+@@ -17782,7 +18035,7 @@
need_version=yes
;;
@@ -11312,7 +11252,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17812,6 +18065,29 @@
+@@ -17815,6 +18068,29 @@
fi
;;
@@ -11342,7 +11282,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17827,12 +18103,17 @@
+@@ -17830,12 +18106,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
@@ -11362,7 +11302,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17864,36 +18145,6 @@
+@@ -17867,36 +18148,6 @@
enable_fast_install=needless
fi
@@ -11399,7 +11339,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17908,7 +18159,8 @@
+@@ -17911,7 +18162,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -11409,7 +11349,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 \
-@@ -18008,6 +18260,12 @@
+@@ -18011,6 +18263,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -11422,7 +11362,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18019,6 +18277,9 @@
+@@ -18022,6 +18280,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -11432,7 +11372,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18038,7 +18299,7 @@
+@@ -18041,7 +18302,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -11441,7 +11381,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18069,7 +18330,7 @@
+@@ -18072,7 +18333,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -11450,7 +11390,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18084,7 +18345,7 @@
+@@ -18087,7 +18348,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -11459,7 +11399,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18286,7 +18547,10 @@
+@@ -18289,7 +18550,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.
@@ -11471,7 +11411,7 @@
fi
-@@ -18319,26 +18583,55 @@
+@@ -18322,26 +18586,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -11528,7 +11468,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -18365,18 +18658,20 @@
+@@ -18368,18 +18661,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -11536,13 +11476,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18371: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18664: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18374: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18667: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18375: \$? = $ac_status" >&5
-+ echo "$as_me:18668: \$? = $ac_status" >&5
+- echo "$as_me:18378: \$? = $ac_status" >&5
++ echo "$as_me:18671: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -11554,7 +11494,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18437,6 +18732,11 @@
+@@ -18440,6 +18735,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -11566,7 +11506,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18453,7 +18753,7 @@
+@@ -18456,7 +18756,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -11575,7 +11515,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18479,6 +18779,16 @@
+@@ -18482,6 +18782,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -11592,7 +11532,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18490,7 +18800,7 @@
+@@ -18493,7 +18803,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -11601,7 +11541,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18514,12 +18824,19 @@
+@@ -18517,12 +18827,19 @@
;;
linux*)
@@ -11622,7 +11562,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18534,15 +18851,15 @@
+@@ -18537,15 +18854,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -11644,7 +11584,7 @@
;;
sunos4*)
-@@ -18551,7 +18868,7 @@
+@@ -18554,7 +18871,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -11653,7 +11593,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18564,6 +18881,17 @@
+@@ -18567,6 +18884,17 @@
fi
;;
@@ -11671,7 +11611,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18598,18 +18926,20 @@
+@@ -18601,18 +18929,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -11679,13 +11619,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18604: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18932: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18607: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18935: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18608: \$? = $ac_status" >&5
-+ echo "$as_me:18936: \$? = $ac_status" >&5
+- echo "$as_me:18611: \$? = $ac_status" >&5
++ echo "$as_me:18939: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -11697,7 +11637,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18630,7 +18960,7 @@
+@@ -18633,7 +18963,7 @@
fi
fi
@@ -11706,7 +11646,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18640,6 +18970,48 @@
+@@ -18643,6 +18973,48 @@
;;
esac
@@ -11755,7 +11695,7 @@
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-@@ -18652,38 +19024,36 @@
+@@ -18655,38 +19027,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -11776,13 +11716,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18671: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19036: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18674: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19039: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18675: \$? = $ac_status" >&5
-+ echo "$as_me:19040: \$? = $ac_status" >&5
+- echo "$as_me:18678: \$? = $ac_status" >&5
++ echo "$as_me:19043: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11806,7 +11746,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18754,6 +19124,16 @@
+@@ -18757,6 +19127,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -11823,7 +11763,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18764,6 +19144,10 @@
+@@ -18767,6 +19147,10 @@
with_gnu_ld=no
fi
;;
@@ -11834,7 +11774,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18774,6 +19158,27 @@
+@@ -18777,6 +19161,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -11862,7 +11802,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18811,7 +19216,7 @@
+@@ -18814,7 +19219,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -11871,7 +11811,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18821,13 +19226,13 @@
+@@ -18824,13 +19229,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -11888,7 +11828,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18836,23 +19241,70 @@
+@@ -18839,23 +19244,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -11965,7 +11905,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18866,13 +19318,40 @@
+@@ -18869,13 +19321,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12008,7 +11948,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18882,24 +19361,19 @@
+@@ -18885,24 +19364,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12040,7 +11980,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18911,7 +19385,7 @@
+@@ -18914,7 +19388,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -12049,7 +11989,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18933,9 +19407,21 @@
+@@ -18936,9 +19410,21 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -12073,7 +12013,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18952,7 +19438,7 @@
+@@ -18955,7 +19441,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -12082,7 +12022,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -18971,8 +19457,12 @@
+@@ -18974,8 +19460,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -12095,7 +12035,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18980,22 +19470,23 @@
+@@ -18983,22 +19473,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -12126,7 +12066,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19046,14 +19537,13 @@
+@@ -19049,14 +19540,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -12144,7 +12084,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19112,13 +19602,11 @@
+@@ -19115,13 +19605,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -12161,7 +12101,7 @@
fi
fi
;;
-@@ -19131,7 +19619,7 @@
+@@ -19134,7 +19622,7 @@
ld_shlibs_GCJ=no
;;
@@ -12170,7 +12110,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19141,68 +19629,68 @@
+@@ -19144,68 +19632,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -12283,7 +12223,7 @@
fi
;;
-@@ -19236,16 +19724,25 @@
+@@ -19239,16 +19727,25 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -12312,7 +12252,7 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -19259,47 +19756,62 @@
+@@ -19262,47 +19759,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -12399,7 +12339,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19313,7 +19825,7 @@
+@@ -19316,7 +19828,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -12408,7 +12348,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19323,7 +19835,7 @@
+@@ -19326,7 +19838,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -12417,7 +12357,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19346,7 +19858,8 @@
+@@ -19349,7 +19861,8 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -12427,7 +12367,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19356,7 +19869,7 @@
+@@ -19359,7 +19872,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -12436,7 +12376,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19367,14 +19880,14 @@
+@@ -19370,14 +19883,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -12453,7 +12393,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19386,13 +19899,13 @@
+@@ -19389,13 +19902,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -12469,7 +12409,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19400,21 +19913,15 @@
+@@ -19403,21 +19916,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -12495,7 +12435,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19423,8 +19930,18 @@
+@@ -19426,8 +19933,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -12516,7 +12456,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19433,7 +19950,7 @@
+@@ -19436,7 +19953,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.
@@ -12525,7 +12465,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19481,36 +19998,45 @@
+@@ -19484,36 +20001,45 @@
fi
;;
@@ -12592,7 +12532,7 @@
;;
uts4*)
-@@ -19529,11 +20055,6 @@
+@@ -19532,11 +20058,6 @@
echo "${ECHO_T}$ld_shlibs_GCJ" >&6
test "$ld_shlibs_GCJ" = no && can_build_shared=no
@@ -12604,7 +12544,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19566,6 +20087,7 @@
+@@ -19569,6 +20090,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -12612,7 +12552,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19601,7 +20123,7 @@
+@@ -19604,7 +20126,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -12621,7 +12561,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19611,7 +20133,20 @@
+@@ -19614,7 +20136,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -12643,7 +12583,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19676,7 +20211,7 @@
+@@ -19679,7 +20214,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -12652,7 +12592,7 @@
;;
beos*)
-@@ -19685,7 +20220,7 @@
+@@ -19688,7 +20223,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -12661,7 +12601,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19701,7 +20236,7 @@
+@@ -19704,7 +20239,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -12670,7 +12610,7 @@
need_version=no
need_lib_prefix=no
-@@ -19713,7 +20248,8 @@
+@@ -19716,7 +20251,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -12680,7 +12620,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19743,7 +20279,7 @@
+@@ -19746,7 +20282,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -12689,7 +12629,7 @@
;;
esac
;;
-@@ -19766,7 +20302,7 @@
+@@ -19769,7 +20305,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -12698,7 +12638,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"`
-@@ -19789,7 +20325,7 @@
+@@ -19792,7 +20328,7 @@
dynamic_linker=no
;;
@@ -12707,7 +12647,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19801,8 +20337,17 @@
+@@ -19804,8 +20340,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -12727,7 +12667,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19820,14 +20365,19 @@
+@@ -19823,14 +20368,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -12749,7 +12689,7 @@
esac
;;
-@@ -19847,9 +20397,9 @@
+@@ -19850,9 +20400,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -12761,7 +12701,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19864,7 +20414,7 @@
+@@ -19867,7 +20417,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -12770,7 +12710,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19875,1112 +20425,343 @@
+@@ -19878,1112 +20428,343 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -13843,7 +13783,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20785 "configure"
+-#line 20788 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -14031,7 +13971,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20883 "configure"
+-#line 20886 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -14185,7 +14125,7 @@
fi
-@@ -20997,7 +20778,8 @@
+@@ -21000,7 +20781,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -14195,7 +14135,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 \
-@@ -21097,6 +20879,12 @@
+@@ -21100,6 +20882,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -14208,7 +14148,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21108,6 +20896,9 @@
+@@ -21111,6 +20899,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -14218,7 +14158,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21127,7 +20918,7 @@
+@@ -21130,7 +20921,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -14227,7 +14167,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21158,7 +20949,7 @@
+@@ -21161,7 +20952,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -14236,7 +14176,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21173,7 +20964,7 @@
+@@ -21176,7 +20967,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -14245,7 +14185,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21375,7 +21166,10 @@
+@@ -21378,7 +21169,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.
@@ -14257,7 +14197,7 @@
fi
-@@ -21414,15 +21208,42 @@
+@@ -21417,15 +21211,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14300,7 +14240,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21438,7 +21259,8 @@
+@@ -21441,7 +21262,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -14310,7 +14250,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 \
-@@ -21538,6 +21360,12 @@
+@@ -21541,6 +21363,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -14323,7 +14263,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21549,6 +21377,9 @@
+@@ -21552,6 +21380,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -14333,7 +14273,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21568,7 +21399,7 @@
+@@ -21571,7 +21402,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -14342,7 +14282,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21599,7 +21430,7 @@
+@@ -21602,7 +21433,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -14351,7 +14291,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21614,7 +21445,7 @@
+@@ -21617,7 +21448,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -14360,7 +14300,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21816,7 +21647,10 @@
+@@ -21819,7 +21650,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.
@@ -14372,7 +14312,7 @@
fi
-@@ -21863,7 +21697,7 @@
+@@ -21866,7 +21700,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -14381,7 +14321,7 @@
# Prevent multiple expansion
-@@ -22262,9 +22096,6 @@
+@@ -22265,9 +22099,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -14391,7 +14331,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22481,9 +22312,6 @@
+@@ -22484,9 +22315,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -14401,7 +14341,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24664,9 +24492,6 @@
+@@ -24667,9 +24495,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -14411,79 +14351,79 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29556,7 +29381,7 @@
+@@ -29559,7 +29384,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29559: $i/$j" >&5
-+ echo "configure: 29384: $i/$j" >&5
+- echo "configure: 29562: $i/$j" >&5
++ echo "configure: 29387: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29854,7 +29679,7 @@
+@@ -29857,7 +29682,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29857: $i/$j" >&5
-+ echo "configure: 29682: $i/$j" >&5
+- echo "configure: 29860: $i/$j" >&5
++ echo "configure: 29685: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30690,7 +30515,7 @@
+@@ -30693,7 +30518,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30693: $i/$j" >&5
-+ echo "configure: 30518: $i/$j" >&5
+- echo "configure: 30696: $i/$j" >&5
++ echo "configure: 30521: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30720,7 +30545,7 @@
+@@ -30723,7 +30548,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30723: $i/$j" >&5
-+ echo "configure: 30548: $i/$j" >&5
+- echo "configure: 30726: $i/$j" >&5
++ echo "configure: 30551: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30738,7 +30563,7 @@
+@@ -30741,7 +30566,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30741: $i/$j" >&5
-+ echo "configure: 30566: $i/$j" >&5
+- echo "configure: 30744: $i/$j" >&5
++ echo "configure: 30569: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32261,7 +32086,7 @@
+@@ -32264,7 +32089,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32264: $i/$j" >&5
-+ echo "configure: 32089: $i/$j" >&5
+- echo "configure: 32267: $i/$j" >&5
++ echo "configure: 32092: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32863,7 +32688,7 @@
+@@ -32866,7 +32691,7 @@
do
for j in qsql.html;
do
-- echo "configure: 32866: $i/$j" >&5
-+ echo "configure: 32691: $i/$j" >&5
+- echo "configure: 32869: $i/$j" >&5
++ echo "configure: 32694: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -34074,7 +33899,7 @@
+@@ -34077,7 +33902,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 34077: $i/$j" >&5
-+ echo "configure: 33902: $i/$j" >&5
+- echo "configure: 34080: $i/$j" >&5
++ echo "configure: 33905: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -34528,7 +34353,8 @@
+@@ -34531,7 +34356,8 @@
vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test -n "$vers" && test "$vers" -ge 1009
then
@@ -14493,754 +14433,745 @@
LIBWV2_RPATH=
for args in $LIBWV2_LIBS; do
case $args in
-@@ -37068,7 +36894,7 @@
+@@ -37071,7 +36897,7 @@
do
for j in mysql/mysql.h;
do
-- echo "configure: 37071: $i/$j" >&5
-+ echo "configure: 36897: $i/$j" >&5
+- echo "configure: 37074: $i/$j" >&5
++ echo "configure: 36900: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
mysql_incdir=$i
-@@ -37097,7 +36923,7 @@
+@@ -37100,7 +36926,7 @@
do
for j in mysql/libmysqlclient.so;
do
-- echo "configure: 37100: $i/$j" >&5
-+ echo "configure: 36926: $i/$j" >&5
+- echo "configure: 37103: $i/$j" >&5
++ echo "configure: 36929: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
mysql_libdir=$i
-@@ -37265,7 +37091,7 @@
+@@ -37268,7 +37094,7 @@
do
for j in libpq-fe.h;
do
-- echo "configure: 37268: $i/$j" >&5
-+ echo "configure: 37094: $i/$j" >&5
+- echo "configure: 37271: $i/$j" >&5
++ echo "configure: 37097: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
pgsql_incdir=$i
-@@ -37294,7 +37120,7 @@
+@@ -37297,7 +37123,7 @@
do
for j in libpq.so;
do
-- echo "configure: 37297: $i/$j" >&5
-+ echo "configure: 37123: $i/$j" >&5
+- echo "configure: 37300: $i/$j" >&5
++ echo "configure: 37126: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
pgsql_libdir=$i
-@@ -37445,7 +37271,7 @@
+@@ -37448,7 +37274,7 @@
do
for j in pqxx/pqxx;
do
-- echo "configure: 37448: $i/$j" >&5
-+ echo "configure: 37274: $i/$j" >&5
+- echo "configure: 37451: $i/$j" >&5
++ echo "configure: 37277: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
pqxx_incdir=$i
-@@ -37476,7 +37302,7 @@
+@@ -37479,7 +37305,7 @@
do
for j in libpqxx.so;
do
-- echo "configure: 37479: $i/$j" >&5
-+ echo "configure: 37305: $i/$j" >&5
+- echo "configure: 37482: $i/$j" >&5
++ echo "configure: 37308: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
pqxx_libdir=$i
-@@ -37527,7 +37353,7 @@
+@@ -37530,7 +37356,7 @@
do
for j in knewstuff/downloaddialog.h;
do
-- echo "configure: 37530: $i/$j" >&5
-+ echo "configure: 37356: $i/$j" >&5
+- echo "configure: 37533: $i/$j" >&5
++ echo "configure: 37359: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
knewstuff_incdir=$i
-@@ -37544,7 +37370,7 @@
+@@ -37547,7 +37373,7 @@
do
for j in libknewstuff.so;
do
-- echo "configure: 37547: $i/$j" >&5
-+ echo "configure: 37373: $i/$j" >&5
+- echo "configure: 37550: $i/$j" >&5
++ echo "configure: 37376: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
knewstuff_libdir=$i
-@@ -37623,7 +37449,7 @@
+@@ -37626,7 +37452,7 @@
do
for j in kfeedbackwizard.h;
do
-- echo "configure: 37626: $i/$j" >&5
-+ echo "configure: 37452: $i/$j" >&5
+- echo "configure: 37629: $i/$j" >&5
++ echo "configure: 37455: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kfeedback_incdir=$i
-@@ -37640,7 +37466,7 @@
+@@ -37643,7 +37469,7 @@
do
for j in libkfeedbackwizard.so;
do
-- echo "configure: 37643: $i/$j" >&5
-+ echo "configure: 37469: $i/$j" >&5
+- echo "configure: 37646: $i/$j" >&5
++ echo "configure: 37472: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kfeedback_libdir=$i
-@@ -37788,7 +37614,7 @@
+@@ -37791,7 +37617,7 @@
do
for j in Python.h;
do
-- echo "configure: 37791: $i/$j" >&5
-+ echo "configure: 37617: $i/$j" >&5
+- echo "configure: 37794: $i/$j" >&5
++ echo "configure: 37620: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37804,7 +37630,7 @@
+@@ -37807,7 +37633,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37807: $i/$j" >&5
-+ echo "configure: 37633: $i/$j" >&5
+- echo "configure: 37810: $i/$j" >&5
++ echo "configure: 37636: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37828,7 +37654,7 @@
+@@ -37831,7 +37657,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 37831: $i/$j" >&5
-+ echo "configure: 37657: $i/$j" >&5
+- echo "configure: 37834: $i/$j" >&5
++ echo "configure: 37660: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37844,7 +37670,7 @@
+@@ -37847,7 +37673,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 37847: $i/$j" >&5
-+ echo "configure: 37673: $i/$j" >&5
+- echo "configure: 37850: $i/$j" >&5
++ echo "configure: 37676: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37860,7 +37686,7 @@
+@@ -37863,7 +37689,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 37863: $i/$j" >&5
-+ echo "configure: 37689: $i/$j" >&5
+- echo "configure: 37866: $i/$j" >&5
++ echo "configure: 37692: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37888,7 +37714,7 @@
+@@ -37891,7 +37717,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 37891: $i/$j" >&5
-+ echo "configure: 37717: $i/$j" >&5
+- echo "configure: 37894: $i/$j" >&5
++ echo "configure: 37720: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -37932,7 +37758,7 @@
+@@ -37935,7 +37761,7 @@
do
for j in Python.h;
do
-- echo "configure: 37935: $i/$j" >&5
-+ echo "configure: 37761: $i/$j" >&5
+- echo "configure: 37938: $i/$j" >&5
++ echo "configure: 37764: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37948,7 +37774,7 @@
+@@ -37951,7 +37777,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37951: $i/$j" >&5
-+ echo "configure: 37777: $i/$j" >&5
+- echo "configure: 37954: $i/$j" >&5
++ echo "configure: 37780: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37972,7 +37798,7 @@
+@@ -37975,7 +37801,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 37975: $i/$j" >&5
-+ echo "configure: 37801: $i/$j" >&5
+- echo "configure: 37978: $i/$j" >&5
++ echo "configure: 37804: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37988,7 +37814,7 @@
+@@ -37991,7 +37817,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 37991: $i/$j" >&5
-+ echo "configure: 37817: $i/$j" >&5
+- echo "configure: 37994: $i/$j" >&5
++ echo "configure: 37820: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38004,7 +37830,7 @@
+@@ -38007,7 +37833,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38007: $i/$j" >&5
-+ echo "configure: 37833: $i/$j" >&5
+- echo "configure: 38010: $i/$j" >&5
++ echo "configure: 37836: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38032,7 +37858,7 @@
+@@ -38035,7 +37861,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38035: $i/$j" >&5
-+ echo "configure: 37861: $i/$j" >&5
+- echo "configure: 38038: $i/$j" >&5
++ echo "configure: 37864: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38076,7 +37902,7 @@
+@@ -38079,7 +37905,7 @@
do
for j in Python.h;
do
-- echo "configure: 38079: $i/$j" >&5
-+ echo "configure: 37905: $i/$j" >&5
+- echo "configure: 38082: $i/$j" >&5
++ echo "configure: 37908: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38092,7 +37918,7 @@
+@@ -38095,7 +37921,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38095: $i/$j" >&5
-+ echo "configure: 37921: $i/$j" >&5
+- echo "configure: 38098: $i/$j" >&5
++ echo "configure: 37924: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38116,7 +37942,7 @@
+@@ -38119,7 +37945,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38119: $i/$j" >&5
-+ echo "configure: 37945: $i/$j" >&5
+- echo "configure: 38122: $i/$j" >&5
++ echo "configure: 37948: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38132,7 +37958,7 @@
+@@ -38135,7 +37961,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38135: $i/$j" >&5
-+ echo "configure: 37961: $i/$j" >&5
+- echo "configure: 38138: $i/$j" >&5
++ echo "configure: 37964: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38148,7 +37974,7 @@
+@@ -38151,7 +37977,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38151: $i/$j" >&5
-+ echo "configure: 37977: $i/$j" >&5
+- echo "configure: 38154: $i/$j" >&5
++ echo "configure: 37980: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38176,7 +38002,7 @@
+@@ -38179,7 +38005,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38179: $i/$j" >&5
-+ echo "configure: 38005: $i/$j" >&5
+- echo "configure: 38182: $i/$j" >&5
++ echo "configure: 38008: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38220,7 +38046,7 @@
+@@ -38223,7 +38049,7 @@
do
for j in Python.h;
do
-- echo "configure: 38223: $i/$j" >&5
-+ echo "configure: 38049: $i/$j" >&5
+- echo "configure: 38226: $i/$j" >&5
++ echo "configure: 38052: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38236,7 +38062,7 @@
+@@ -38239,7 +38065,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38239: $i/$j" >&5
-+ echo "configure: 38065: $i/$j" >&5
+- echo "configure: 38242: $i/$j" >&5
++ echo "configure: 38068: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38260,7 +38086,7 @@
+@@ -38263,7 +38089,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38263: $i/$j" >&5
-+ echo "configure: 38089: $i/$j" >&5
+- echo "configure: 38266: $i/$j" >&5
++ echo "configure: 38092: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38276,7 +38102,7 @@
+@@ -38279,7 +38105,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38279: $i/$j" >&5
-+ echo "configure: 38105: $i/$j" >&5
+- echo "configure: 38282: $i/$j" >&5
++ echo "configure: 38108: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38292,7 +38118,7 @@
+@@ -38295,7 +38121,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38295: $i/$j" >&5
-+ echo "configure: 38121: $i/$j" >&5
+- echo "configure: 38298: $i/$j" >&5
++ echo "configure: 38124: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38320,7 +38146,7 @@
+@@ -38323,7 +38149,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38323: $i/$j" >&5
-+ echo "configure: 38149: $i/$j" >&5
+- echo "configure: 38326: $i/$j" >&5
++ echo "configure: 38152: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38364,7 +38190,7 @@
+@@ -38367,7 +38193,7 @@
do
for j in Python.h;
do
-- echo "configure: 38367: $i/$j" >&5
-+ echo "configure: 38193: $i/$j" >&5
+- echo "configure: 38370: $i/$j" >&5
++ echo "configure: 38196: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38380,7 +38206,7 @@
+@@ -38383,7 +38209,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38383: $i/$j" >&5
-+ echo "configure: 38209: $i/$j" >&5
+- echo "configure: 38386: $i/$j" >&5
++ echo "configure: 38212: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38404,7 +38230,7 @@
+@@ -38407,7 +38233,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38407: $i/$j" >&5
-+ echo "configure: 38233: $i/$j" >&5
+- echo "configure: 38410: $i/$j" >&5
++ echo "configure: 38236: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38420,7 +38246,7 @@
+@@ -38423,7 +38249,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38423: $i/$j" >&5
-+ echo "configure: 38249: $i/$j" >&5
+- echo "configure: 38426: $i/$j" >&5
++ echo "configure: 38252: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38436,7 +38262,7 @@
+@@ -38439,7 +38265,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38439: $i/$j" >&5
-+ echo "configure: 38265: $i/$j" >&5
+- echo "configure: 38442: $i/$j" >&5
++ echo "configure: 38268: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38464,7 +38290,7 @@
+@@ -38467,7 +38293,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38467: $i/$j" >&5
-+ echo "configure: 38293: $i/$j" >&5
+- echo "configure: 38470: $i/$j" >&5
++ echo "configure: 38296: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38508,7 +38334,7 @@
+@@ -38511,7 +38337,7 @@
do
for j in Python.h;
do
-- echo "configure: 38511: $i/$j" >&5
-+ echo "configure: 38337: $i/$j" >&5
+- echo "configure: 38514: $i/$j" >&5
++ echo "configure: 38340: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38524,7 +38350,7 @@
+@@ -38527,7 +38353,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38527: $i/$j" >&5
-+ echo "configure: 38353: $i/$j" >&5
+- echo "configure: 38530: $i/$j" >&5
++ echo "configure: 38356: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38548,7 +38374,7 @@
+@@ -38551,7 +38377,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38551: $i/$j" >&5
-+ echo "configure: 38377: $i/$j" >&5
+- echo "configure: 38554: $i/$j" >&5
++ echo "configure: 38380: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38564,7 +38390,7 @@
+@@ -38567,7 +38393,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38567: $i/$j" >&5
-+ echo "configure: 38393: $i/$j" >&5
+- echo "configure: 38570: $i/$j" >&5
++ echo "configure: 38396: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38580,7 +38406,7 @@
+@@ -38583,7 +38409,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38583: $i/$j" >&5
-+ echo "configure: 38409: $i/$j" >&5
+- echo "configure: 38586: $i/$j" >&5
++ echo "configure: 38412: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38608,7 +38434,7 @@
+@@ -38611,7 +38437,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38611: $i/$j" >&5
-+ echo "configure: 38437: $i/$j" >&5
+- echo "configure: 38614: $i/$j" >&5
++ echo "configure: 38440: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48037,7 +47863,7 @@
+@@ -48445,7 +48271,7 @@
do
- for j in kspell2/broker.h;
- do
-- echo "configure: 48040: $i/$j" >&5
-+ echo "configure: 47866: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- ac_kspell2_includes=$i
-@@ -48113,7 +47939,7 @@
- do
for j in Python.h;
do
-- echo "configure: 48116: $i/$j" >&5
-+ echo "configure: 47942: $i/$j" >&5
+- echo "configure: 48448: $i/$j" >&5
++ echo "configure: 48274: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48129,7 +47955,7 @@
+@@ -48461,7 +48287,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48132: $i/$j" >&5
-+ echo "configure: 47958: $i/$j" >&5
+- echo "configure: 48464: $i/$j" >&5
++ echo "configure: 48290: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48153,7 +47979,7 @@
+@@ -48485,7 +48311,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48156: $i/$j" >&5
-+ echo "configure: 47982: $i/$j" >&5
+- echo "configure: 48488: $i/$j" >&5
++ echo "configure: 48314: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48169,7 +47995,7 @@
+@@ -48501,7 +48327,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48172: $i/$j" >&5
-+ echo "configure: 47998: $i/$j" >&5
+- echo "configure: 48504: $i/$j" >&5
++ echo "configure: 48330: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48185,7 +48011,7 @@
+@@ -48517,7 +48343,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48188: $i/$j" >&5
-+ echo "configure: 48014: $i/$j" >&5
+- echo "configure: 48520: $i/$j" >&5
++ echo "configure: 48346: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48213,7 +48039,7 @@
+@@ -48545,7 +48371,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48216: $i/$j" >&5
-+ echo "configure: 48042: $i/$j" >&5
+- echo "configure: 48548: $i/$j" >&5
++ echo "configure: 48374: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48257,7 +48083,7 @@
+@@ -48589,7 +48415,7 @@
do
for j in Python.h;
do
-- echo "configure: 48260: $i/$j" >&5
-+ echo "configure: 48086: $i/$j" >&5
+- echo "configure: 48592: $i/$j" >&5
++ echo "configure: 48418: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48273,7 +48099,7 @@
+@@ -48605,7 +48431,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48276: $i/$j" >&5
-+ echo "configure: 48102: $i/$j" >&5
+- echo "configure: 48608: $i/$j" >&5
++ echo "configure: 48434: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48297,7 +48123,7 @@
+@@ -48629,7 +48455,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48300: $i/$j" >&5
-+ echo "configure: 48126: $i/$j" >&5
+- echo "configure: 48632: $i/$j" >&5
++ echo "configure: 48458: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48313,7 +48139,7 @@
+@@ -48645,7 +48471,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48316: $i/$j" >&5
-+ echo "configure: 48142: $i/$j" >&5
+- echo "configure: 48648: $i/$j" >&5
++ echo "configure: 48474: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48329,7 +48155,7 @@
+@@ -48661,7 +48487,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48332: $i/$j" >&5
-+ echo "configure: 48158: $i/$j" >&5
+- echo "configure: 48664: $i/$j" >&5
++ echo "configure: 48490: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48357,7 +48183,7 @@
+@@ -48689,7 +48515,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48360: $i/$j" >&5
-+ echo "configure: 48186: $i/$j" >&5
+- echo "configure: 48692: $i/$j" >&5
++ echo "configure: 48518: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48401,7 +48227,7 @@
+@@ -48733,7 +48559,7 @@
do
for j in Python.h;
do
-- echo "configure: 48404: $i/$j" >&5
-+ echo "configure: 48230: $i/$j" >&5
+- echo "configure: 48736: $i/$j" >&5
++ echo "configure: 48562: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48417,7 +48243,7 @@
+@@ -48749,7 +48575,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48420: $i/$j" >&5
-+ echo "configure: 48246: $i/$j" >&5
+- echo "configure: 48752: $i/$j" >&5
++ echo "configure: 48578: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48441,7 +48267,7 @@
+@@ -48773,7 +48599,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48444: $i/$j" >&5
-+ echo "configure: 48270: $i/$j" >&5
+- echo "configure: 48776: $i/$j" >&5
++ echo "configure: 48602: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48457,7 +48283,7 @@
+@@ -48789,7 +48615,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48460: $i/$j" >&5
-+ echo "configure: 48286: $i/$j" >&5
+- echo "configure: 48792: $i/$j" >&5
++ echo "configure: 48618: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48473,7 +48299,7 @@
+@@ -48805,7 +48631,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48476: $i/$j" >&5
-+ echo "configure: 48302: $i/$j" >&5
+- echo "configure: 48808: $i/$j" >&5
++ echo "configure: 48634: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48501,7 +48327,7 @@
+@@ -48833,7 +48659,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48504: $i/$j" >&5
-+ echo "configure: 48330: $i/$j" >&5
+- echo "configure: 48836: $i/$j" >&5
++ echo "configure: 48662: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48545,7 +48371,7 @@
+@@ -48877,7 +48703,7 @@
do
for j in Python.h;
do
-- echo "configure: 48548: $i/$j" >&5
-+ echo "configure: 48374: $i/$j" >&5
+- echo "configure: 48880: $i/$j" >&5
++ echo "configure: 48706: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48561,7 +48387,7 @@
+@@ -48893,7 +48719,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48564: $i/$j" >&5
-+ echo "configure: 48390: $i/$j" >&5
+- echo "configure: 48896: $i/$j" >&5
++ echo "configure: 48722: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48585,7 +48411,7 @@
+@@ -48917,7 +48743,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48588: $i/$j" >&5
-+ echo "configure: 48414: $i/$j" >&5
+- echo "configure: 48920: $i/$j" >&5
++ echo "configure: 48746: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48601,7 +48427,7 @@
+@@ -48933,7 +48759,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48604: $i/$j" >&5
-+ echo "configure: 48430: $i/$j" >&5
+- echo "configure: 48936: $i/$j" >&5
++ echo "configure: 48762: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48617,7 +48443,7 @@
+@@ -48949,7 +48775,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48620: $i/$j" >&5
-+ echo "configure: 48446: $i/$j" >&5
+- echo "configure: 48952: $i/$j" >&5
++ echo "configure: 48778: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48645,7 +48471,7 @@
+@@ -48977,7 +48803,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48648: $i/$j" >&5
-+ echo "configure: 48474: $i/$j" >&5
+- echo "configure: 48980: $i/$j" >&5
++ echo "configure: 48806: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48689,7 +48515,7 @@
+@@ -49021,7 +48847,7 @@
do
for j in Python.h;
do
-- echo "configure: 48692: $i/$j" >&5
-+ echo "configure: 48518: $i/$j" >&5
+- echo "configure: 49024: $i/$j" >&5
++ echo "configure: 48850: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48705,7 +48531,7 @@
+@@ -49037,7 +48863,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48708: $i/$j" >&5
-+ echo "configure: 48534: $i/$j" >&5
+- echo "configure: 49040: $i/$j" >&5
++ echo "configure: 48866: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48729,7 +48555,7 @@
+@@ -49061,7 +48887,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48732: $i/$j" >&5
-+ echo "configure: 48558: $i/$j" >&5
+- echo "configure: 49064: $i/$j" >&5
++ echo "configure: 48890: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48745,7 +48571,7 @@
+@@ -49077,7 +48903,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48748: $i/$j" >&5
-+ echo "configure: 48574: $i/$j" >&5
+- echo "configure: 49080: $i/$j" >&5
++ echo "configure: 48906: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48761,7 +48587,7 @@
+@@ -49093,7 +48919,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48764: $i/$j" >&5
-+ echo "configure: 48590: $i/$j" >&5
+- echo "configure: 49096: $i/$j" >&5
++ echo "configure: 48922: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48789,7 +48615,7 @@
+@@ -49121,7 +48947,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48792: $i/$j" >&5
-+ echo "configure: 48618: $i/$j" >&5
+- echo "configure: 49124: $i/$j" >&5
++ echo "configure: 48950: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48833,7 +48659,7 @@
+@@ -49165,7 +48991,7 @@
do
for j in Python.h;
do
-- echo "configure: 48836: $i/$j" >&5
-+ echo "configure: 48662: $i/$j" >&5
+- echo "configure: 49168: $i/$j" >&5
++ echo "configure: 48994: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48849,7 +48675,7 @@
+@@ -49181,7 +49007,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48852: $i/$j" >&5
-+ echo "configure: 48678: $i/$j" >&5
+- echo "configure: 49184: $i/$j" >&5
++ echo "configure: 49010: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48873,7 +48699,7 @@
+@@ -49205,7 +49031,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48876: $i/$j" >&5
-+ echo "configure: 48702: $i/$j" >&5
+- echo "configure: 49208: $i/$j" >&5
++ echo "configure: 49034: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48889,7 +48715,7 @@
+@@ -49221,7 +49047,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48892: $i/$j" >&5
-+ echo "configure: 48718: $i/$j" >&5
+- echo "configure: 49224: $i/$j" >&5
++ echo "configure: 49050: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48905,7 +48731,7 @@
+@@ -49237,7 +49063,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48908: $i/$j" >&5
-+ echo "configure: 48734: $i/$j" >&5
+- echo "configure: 49240: $i/$j" >&5
++ echo "configure: 49066: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48933,7 +48759,7 @@
+@@ -49265,7 +49091,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48936: $i/$j" >&5
-+ echo "configure: 48762: $i/$j" >&5
+- echo "configure: 49268: $i/$j" >&5
++ echo "configure: 49094: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -58453,6 +58279,13 @@
+@@ -58795,6 +58621,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -15254,7 +15185,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -60025,6 +59858,9 @@
+@@ -60367,6 +60200,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -15285,45 +15216,6 @@
LIBWV2_RPATH=
for args in $LIBWV2_LIBS; do
case $args in
---- 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: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,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@
-@@ -538,7 +541,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*) \
-@@ -576,9 +579,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- doc/karbon/Makefile.in
+++ doc/karbon/Makefile.in
@@ -1,4 +1,4 @@
@@ -15342,7 +15234,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15351,7 +15243,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15381,7 +15273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15390,7 +15282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15420,7 +15312,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15429,7 +15321,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15459,7 +15351,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15468,7 +15360,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15498,7 +15390,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15507,7 +15399,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15537,7 +15429,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15546,7 +15438,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15576,7 +15468,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15585,7 +15477,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15615,7 +15507,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15624,7 +15516,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15654,7 +15546,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15663,7 +15555,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15693,7 +15585,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15702,7 +15594,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15714,7 +15606,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -707,7 +710,7 @@
+@@ -708,7 +711,7 @@
KDE_DIST=dialogs-colorrange.png crocusses-sobel.png crocusses-topedge.png tutorial-quick-starts12.png palettes-controlbox-contiguousfill.png dialogs-customconvolution.png using-selections-5.png settings.docbook tutorial-quick-starts6.png using-selections-2.png developers.docbook toolbar-brushes-patterns-custompattern.png palettes-layers-layers.png tool-polygon.png palettes-controlbox-rectangle.png index.docbook dialogs-convertlayertype.png dialogs-emboss.png palettes-colors-rgb.png palettes-controlbox-polygon.png commands-palettes.docbook crocusses-bumpmap.png tool-selectoutline.png tutorial-select-layer-1.png toolbar-brushes-patterns.png dialogs-imagesize.png dialogs-bumpmap.png preferences-performance.png tool-duplicate.png palettes-controlbox-paintwithfilters.png tool-text.png tool-brush.png tutorial-select-layer-9.png dialogs-convertimagetype.png palettes-layers-scriptsmanager.png dialogs-roundcorners.png crocusses-edgeright.png preferences-color.png dialogs-layerproperties.png dialogs-imagerestoration.png palettes-colors-palettes.png tool-line.png tool-pan.png tool-paintselection.png palettes-controlbox-transform.png crocusses-sharpen.png faq.docbook crocusses-raindrops.png tool-move.png palettes-controlbox-select.png dialogs-dropshadow.png tool-selectelliptical.png toolbar-file.png crocusses.png palettes-controlbox-selectcontiguous.png tool-selectrectangular.png toolbar-edit.png palettes-controlbox-star.png tutorial-select-layer-13.png tutorial-select-layer-7.png preferences-sidebar.png tutorial-quick-starts5.png using-filters.docbook tutorial-select-layer-5.png toolbar-brushesandstuff.png crocusses-edgebottom.png palettes-controlbox-overview.png palettes-controlbox-brush.png dialogs-shearimage.png palettes-controlbox-selectsimilar.png toolbar-krita.png crocusses-embossvariable.png toolbar-transformationtools.png palettes-colors-hsv.png Makefile.in dialogs-histogram.png tutorial-select-layer-3.png commands-menus.docbook introduction.docbook crocusses-tiles.png tutorial-quick-starts1.png dialogs-documentinformation.png using-selections-4.png crocusses-invert.png crocusses-embosshorvert.png newimage.png palettes-controlbox-text.png using-selections.docbook tutorial-select-layer-sample.png palettes-colors-watercolors.png installation.docbook tutorial-select-layer-10.png dialogs-coloradjustment.png tool-rectangle.png dialogs-cubism.png toolbar-brushes-brushshapes-predefined.png crocusses-edgeleft.png dialogs-addpalette.png crocusses-embossall.png using-layers.docbook tool-transform.png preferences-grid.png crocusses-roundcorners.png tutorial-select-layer-4.png dialogs-filtersgallery.png tool-selectpolygonal.png dialogs-newlayer.png tool-star.png tutorial-quick-starts10.png dialogs-brightnesscontrast.png using-selections-3.png commands-dialogs.docbook palettes-controlbox-histogram.png dialogs-rotateimage.png tutorial-select-layer-2.png scripting.docbook tutorial-quick-starts8.png dialogs-pixelize.png tutorial-quick-starts.docbook tool-ellipse.png credits.docbook crocusses-simplenoise.png dialogs-layersize.png dialogs-shearlayer.png tutorial.docbook tool-contiguousfill.png commands.docbook palettes-controlbox-line.png tutorial-quick-starts3.png tutorial-select-layer-12.png crocusses-pixelize.png dialogs-rotatelayer.png preferences-general.png commands-toolbars.docbook toolbar-brushes-gradients.png tool-eraseselection.png dialogs-oilpaint.png index.cache.bz2 toolbar-navigation.png tutorial-select-layer-6.png using-selections-1.png using-selections-6.png tutorial-select-layer-8.png tutorial-quick-starts9.png palettes-controlbox-crop.png tutorial-quick-starts2.png palettes-colors-gray.png tutorial-quick-starts7.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-gradient.png tool-colorpicker.png dialogs-separateimage.png dialogs-newadjustmentlayer.png using-colorspaces.docbook dialogs-sobel.png palettes-controlbox-colorpicker.png tool-zoom.png crocusses-oilpaint.png tutorial-quick-starts11.png tool-selectsimilar.png tutorial-starting.docbook dialogs-smalltiles.png preferences-display.png preferences-tablet.png tool-selectcontiguous.png crocusses-gaussianblur.png dialogs-imageproperties.png tool-paintwithfilters.png dialogs-raindrops.png tutorial-select-layer.docbook tool-gradient.png toolbar-brushes-brushshapes-autobrush.png tutorial-select-layer-11.png tool-crop.png mainscreen.png crocusses-meanremoval.png tutorial-quick-starts4.png tool-polyline.png createdocument.png Makefile.am
#>+ 24
@@ -15723,7 +15615,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -734,20 +737,20 @@
+@@ -735,20 +738,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita
@@ -15765,7 +15657,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15774,7 +15666,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15804,7 +15696,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15813,7 +15705,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15843,7 +15735,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15852,7 +15744,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15864,6 +15756,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,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@
+@@ -539,7 +542,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -577,9 +580,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- doc/thesaurus/Makefile.in
+++ doc/thesaurus/Makefile.in
@@ -1,4 +1,4 @@
@@ -15882,7 +15813,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15891,7 +15822,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15943,7 +15874,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -627,7 +628,7 @@
+@@ -628,7 +629,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -15952,7 +15883,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -665,9 +666,9 @@
+@@ -666,9 +667,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15964,45 +15895,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/Makefile.in
-+++ filters/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -252,6 +252,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@
-@@ -547,7 +550,7 @@
- all: docs-am all-recursive
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -585,9 +588,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
--- filters/generic_wrapper/Makefile.in
+++ filters/generic_wrapper/Makefile.in
@@ -1,4 +1,4 @@
@@ -16030,7 +15922,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16039,7 +15931,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16051,45 +15943,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/karbon/Makefile.in
-+++ filters/karbon/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,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@
-@@ -534,7 +537,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*) \
-@@ -572,9 +575,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- filters/karbon/ai/Makefile.in
+++ filters/karbon/ai/Makefile.in
@@ -1,4 +1,4 @@
@@ -16117,7 +15970,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -621,7 +622,7 @@
+@@ -622,7 +623,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16126,7 +15979,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -659,9 +660,9 @@
+@@ -660,9 +661,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16165,7 +16018,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16174,7 +16027,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16213,7 +16066,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +615,7 @@
+@@ -615,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16222,7 +16075,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +653,9 @@
+@@ -653,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16261,7 +16114,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +581,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16270,7 +16123,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +619,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16282,6 +16135,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- filters/karbon/Makefile.in
++++ filters/karbon/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- filters/karbon/msod/Makefile.in
+++ filters/karbon/msod/Makefile.in
@@ -1,4 +1,4 @@
@@ -16309,7 +16201,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16318,7 +16210,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +624,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16357,7 +16249,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16366,7 +16258,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16405,7 +16297,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +593,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16414,7 +16306,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +631,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16453,7 +16345,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +607,7 @@
+@@ -607,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16462,7 +16354,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +645,9 @@
+@@ -645,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16501,7 +16393,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +598,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16510,7 +16402,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +636,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16549,7 +16441,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -607,7 +608,7 @@
+@@ -608,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16558,7 +16450,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +646,9 @@
+@@ -646,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16597,7 +16489,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +593,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16606,7 +16498,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +631,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16618,15 +16510,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kchart/Makefile.in
-+++ filters/kchart/Makefile.in
+--- filters/kchart/bmp/Makefile.in
++++ filters/kchart/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: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkchartbmpexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16636,16 +16537,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -594,7 +595,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16655,10 +16556,10 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- filters/kchart/bmp/Makefile.in
-+++ filters/kchart/bmp/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kchart/jpeg/Makefile.in
++++ filters/kchart/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.
@@ -16669,7 +16570,7 @@
--SOURCES = $(libkchartbmpexport_la_SOURCES)
+-SOURCES = $(libkchartjpegexport_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -16684,7 +16585,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16693,7 +16594,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16705,24 +16606,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kchart/jpeg/Makefile.in
-+++ filters/kchart/jpeg/Makefile.in
+--- filters/kchart/libimageexport/Makefile.in
++++ filters/kchart/libimageexport/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -19,8 +19,6 @@
+@@ -18,8 +18,6 @@
+ ####### General stuff
-
--SOURCES = $(libkchartjpegexport_la_SOURCES)
+-SOURCES = $(libkchartimageexport_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16732,7 +16633,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16741,7 +16642,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16751,26 +16652,17 @@
-$(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)
---- filters/kchart/libimageexport/Makefile.in
-+++ filters/kchart/libimageexport/Makefile.in
+--- filters/kchart/Makefile.in
++++ filters/kchart/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libkchartimageexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16780,16 +16672,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -535,7 +538,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*) \
-@@ -625,9 +626,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16799,8 +16691,8 @@
-$(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)
+
+ mostlyclean-libtool:
--- filters/kchart/mng/Makefile.in
+++ filters/kchart/mng/Makefile.in
@@ -1,4 +1,4 @@
@@ -16828,7 +16720,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16837,7 +16729,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16876,7 +16768,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16885,7 +16777,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16924,7 +16816,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -16933,7 +16825,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16972,7 +16864,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16981,7 +16873,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17020,7 +16912,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17029,7 +16921,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17041,15 +16933,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kformula/Makefile.in
-+++ filters/kformula/Makefile.in
+--- filters/kformula/latex/Makefile.in
++++ filters/kformula/latex/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkfolatexexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17059,16 +16960,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -589,7 +590,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17078,26 +16979,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- filters/kformula/latex/Makefile.in
-+++ filters/kformula/latex/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kformula/Makefile.in
++++ filters/kformula/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkfolatexexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17107,16 +16999,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -535,7 +538,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*) \
-@@ -626,9 +627,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17126,8 +17018,8 @@
-$(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:
--- filters/kformula/mathml/Makefile.in
+++ filters/kformula/mathml/Makefile.in
@@ -1,4 +1,4 @@
@@ -17155,7 +17047,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +596,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -17164,7 +17056,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +634,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17203,7 +17095,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -17212,7 +17104,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17251,7 +17143,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -17260,7 +17152,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +627,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17272,45 +17164,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kivio/Makefile.in
-+++ filters/kivio/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,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@
-@@ -534,7 +537,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*) \
-@@ -572,9 +575,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- filters/kivio/imageexport/Makefile.in
+++ filters/kivio/imageexport/Makefile.in
@@ -1,4 +1,4 @@
@@ -17338,7 +17191,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17347,7 +17200,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17359,8 +17212,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kpresenter/Makefile.in
-+++ filters/kpresenter/Makefile.in
+--- filters/kivio/Makefile.in
++++ filters/kivio/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17377,7 +17230,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17386,7 +17239,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17425,7 +17278,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17434,7 +17287,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17473,7 +17326,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17482,7 +17335,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17521,7 +17374,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +574,7 @@
+@@ -574,7 +575,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -17530,7 +17383,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +612,9 @@
+@@ -612,9 +613,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17569,7 +17422,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +585,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17578,7 +17431,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +623,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17608,7 +17461,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17617,7 +17470,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17629,24 +17482,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
---- filters/kpresenter/mng/Makefile.in
-+++ filters/kpresenter/mng/Makefile.in
+--- filters/kpresenter/Makefile.in
++++ filters/kpresenter/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkpresentermngexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17656,16 +17500,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -535,7 +538,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*) \
-@@ -632,9 +633,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17675,26 +17519,26 @@
-$(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)
---- filters/kpresenter/ooimpress/Makefile.in
-+++ filters/kpresenter/ooimpress/Makefile.in
+
+ mostlyclean-libtool:
+--- filters/kpresenter/mng/Makefile.in
++++ filters/kpresenter/mng/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -18,8 +18,6 @@
- ####### General stuff
+@@ -19,8 +19,6 @@
--SOURCES = $(libooimpressexport_la_SOURCES) $(libooimpressimport_la_SOURCES)
+
+-SOURCES = $(libkpresentermngexport_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -292,6 +290,9 @@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17704,16 +17548,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17725,24 +17569,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kpresenter/png/Makefile.in
-+++ filters/kpresenter/png/Makefile.in
+--- filters/kpresenter/ooimpress/Makefile.in
++++ filters/kpresenter/ooimpress/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -19,8 +19,6 @@
+@@ -18,8 +18,6 @@
+ ####### General stuff
-
--SOURCES = $(libkpresenterpngexport_la_SOURCES)
+-SOURCES = $(libooimpressexport_la_SOURCES) $(libooimpressimport_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -292,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17752,16 +17596,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,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*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17773,15 +17617,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kpresenter/powerpoint/Makefile.in
-+++ filters/kpresenter/powerpoint/Makefile.in
+--- filters/kpresenter/png/Makefile.in
++++ filters/kpresenter/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: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkpresenterpngexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17791,16 +17644,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -595,7 +596,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17810,8 +17663,8 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- filters/kpresenter/powerpoint/import/Makefile.in
+++ filters/kpresenter/powerpoint/import/Makefile.in
@@ -1,4 +1,4 @@
@@ -17839,7 +17692,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +577,7 @@
+@@ -577,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -17848,7 +17701,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +615,9 @@
+@@ -615,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17887,7 +17740,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -558,7 +559,7 @@
+@@ -559,7 +560,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17896,7 +17749,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +597,9 @@
+@@ -597,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17908,24 +17761,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- filters/kpresenter/svg/Makefile.in
-+++ filters/kpresenter/svg/Makefile.in
+--- filters/kpresenter/powerpoint/Makefile.in
++++ filters/kpresenter/powerpoint/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkpresentersvgexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17935,16 +17779,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +591,7 @@
+@@ -535,7 +538,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*) \
-@@ -628,9 +629,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17954,10 +17798,10 @@
-$(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)
---- filters/kpresenter/xbm/Makefile.in
-+++ filters/kpresenter/xbm/Makefile.in
+
+ mostlyclean-libtool:
+--- filters/kpresenter/svg/Makefile.in
++++ filters/kpresenter/svg/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17968,12 +17812,12 @@
--SOURCES = $(libkpresenterxbmexport_la_SOURCES)
+-SOURCES = $(libkpresentersvgexport_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17983,16 +17827,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -591,7 +592,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*) \
-@@ -632,9 +633,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18004,8 +17848,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kpresenter/xpm/Makefile.in
-+++ filters/kpresenter/xpm/Makefile.in
+--- filters/kpresenter/xbm/Makefile.in
++++ filters/kpresenter/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.
@@ -18016,7 +17860,7 @@
--SOURCES = $(libkpresenterxpmexport_la_SOURCES)
+-SOURCES = $(libkpresenterxbmexport_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -18031,7 +17875,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18040,7 +17884,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18052,15 +17896,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/krita/Makefile.in
-+++ filters/krita/Makefile.in
+--- filters/kpresenter/xpm/Makefile.in
++++ filters/kpresenter/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: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkpresenterxpmexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18070,16 +17923,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
- all: docs-am all-recursive
+@@ -595,7 +596,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18089,8 +17942,8 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- filters/krita/jpeg/Makefile.in
+++ filters/krita/jpeg/Makefile.in
@@ -1,4 +1,4 @@
@@ -18118,7 +17971,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -644,7 +645,7 @@
+@@ -645,7 +646,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -18127,7 +17980,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -682,9 +683,9 @@
+@@ -683,9 +684,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18166,7 +18019,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +568,7 @@
+@@ -568,7 +569,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18175,7 +18028,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +606,9 @@
+@@ -606,9 +607,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18214,7 +18067,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -623,7 +624,7 @@
+@@ -624,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -18223,7 +18076,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -661,9 +662,9 @@
+@@ -662,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18235,6 +18088,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- filters/krita/Makefile.in
++++ filters/krita/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,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@
+@@ -543,7 +546,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -581,9 +584,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- filters/krita/openexr/Makefile.in
+++ filters/krita/openexr/Makefile.in
@@ -1,4 +1,4 @@
@@ -18262,7 +18154,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -623,7 +624,7 @@
+@@ -624,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18271,7 +18163,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -661,9 +662,9 @@
+@@ -662,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18310,7 +18202,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -623,7 +624,7 @@
+@@ -624,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -18319,7 +18211,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -661,9 +662,9 @@
+@@ -662,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18358,7 +18250,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +598,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18367,7 +18259,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +636,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18406,7 +18298,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -656,7 +657,7 @@
+@@ -657,7 +658,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -18415,7 +18307,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -694,9 +695,9 @@
+@@ -695,9 +696,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18454,7 +18346,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -623,7 +624,7 @@
+@@ -624,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18463,7 +18355,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -661,9 +662,9 @@
+@@ -662,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18475,45 +18367,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kspread/Makefile.in
-+++ filters/kspread/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,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@
-@@ -534,7 +537,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*) \
-@@ -572,9 +575,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- filters/kspread/applixspread/Makefile.in
+++ filters/kspread/applixspread/Makefile.in
@@ -1,4 +1,4 @@
@@ -18541,7 +18394,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +581,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -18550,7 +18403,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +619,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18589,7 +18442,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +602,7 @@
+@@ -602,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -18598,7 +18451,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +640,9 @@
+@@ -640,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18637,7 +18490,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -18646,7 +18499,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18658,15 +18511,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kspread/excel/Makefile.in
-+++ filters/kspread/excel/Makefile.in
+--- filters/kspread/excel/import/Makefile.in
++++ filters/kspread/excel/import/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -251,6 +251,9 @@
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libexcelimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18676,16 +18538,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
- all: docs-am all-recursive
+@@ -581,7 +582,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*) \
-@@ -581,9 +584,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18695,26 +18557,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- filters/kspread/excel/import/Makefile.in
-+++ filters/kspread/excel/import/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kspread/excel/Makefile.in
++++ filters/kspread/excel/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libexcelimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18724,16 +18577,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +581,7 @@
+@@ -544,7 +547,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*) \
-@@ -618,9 +619,9 @@
+@@ -582,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18743,8 +18596,8 @@
-$(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:
--- filters/kspread/excel/sidewinder/Makefile.in
+++ filters/kspread/excel/sidewinder/Makefile.in
@@ -1,4 +1,4 @@
@@ -18772,7 +18625,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -558,7 +559,7 @@
+@@ -559,7 +560,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18781,7 +18634,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +597,9 @@
+@@ -597,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18820,7 +18673,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -18829,7 +18682,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18868,7 +18721,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -18877,7 +18730,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18889,15 +18742,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kspread/latex/Makefile.in
-+++ filters/kspread/latex/Makefile.in
+--- filters/kspread/latex/export/Makefile.in
++++ filters/kspread/latex/export/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkspreadlatexexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18907,16 +18769,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -615,7 +616,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*) \
-@@ -572,9 +575,9 @@
+@@ -653,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18926,26 +18788,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- filters/kspread/latex/export/Makefile.in
-+++ filters/kspread/latex/export/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kspread/latex/Makefile.in
++++ filters/kspread/latex/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(libkspreadlatexexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -296,6 +294,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18955,16 +18808,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +615,7 @@
+@@ -535,7 +538,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*) \
-@@ -652,9 +653,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18974,8 +18827,8 @@
-$(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:
--- filters/kspread/libkspreadexport/Makefile.in
+++ filters/kspread/libkspreadexport/Makefile.in
@@ -1,4 +1,4 @@
@@ -19003,7 +18856,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19012,7 +18865,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19024,24 +18877,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kspread/opencalc/Makefile.in
-+++ filters/kspread/opencalc/Makefile.in
+--- filters/kspread/Makefile.in
++++ filters/kspread/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -18,8 +18,6 @@
- ####### General stuff
-
-
--SOURCES = $(libopencalcexport_la_SOURCES) $(libopencalcimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -296,6 +294,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19051,16 +18895,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +601,7 @@
+@@ -535,7 +538,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*) \
-@@ -638,9 +639,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19070,10 +18914,10 @@
-$(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)
---- filters/kspread/qpro/Makefile.in
-+++ filters/kspread/qpro/Makefile.in
+
+ mostlyclean-libtool:
+--- filters/kspread/opencalc/Makefile.in
++++ filters/kspread/opencalc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19084,12 +18928,12 @@
####### General stuff
--SOURCES = $(libqproimport_la_SOURCES)
+-SOURCES = $(libopencalcexport_la_SOURCES) $(libopencalcimport_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -298,6 +296,9 @@
+@@ -296,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19138,7 +18982,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -537,7 +540,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19147,7 +18991,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19177,7 +19021,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -524,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19186,7 +19030,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -562,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19225,7 +19069,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -558,7 +559,7 @@
+@@ -559,7 +560,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19234,7 +19078,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +597,9 @@
+@@ -597,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19246,15 +19090,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- filters/kugar/Makefile.in
-+++ filters/kugar/Makefile.in
+--- filters/kspread/qpro/Makefile.in
++++ filters/kspread/qpro/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libqproimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19264,16 +19117,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -602,7 +603,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*) \
-@@ -572,9 +575,9 @@
+@@ -640,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19283,8 +19136,8 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- filters/kugar/kugarnop/Makefile.in
+++ filters/kugar/kugarnop/Makefile.in
@@ -1,4 +1,4 @@
@@ -19312,7 +19165,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +578,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19321,7 +19174,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +616,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19333,15 +19186,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/Makefile.in
-+++ filters/kword/Makefile.in
+--- filters/kugar/Makefile.in
++++ filters/kugar/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -251,6 +251,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19351,7 +19204,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19360,7 +19213,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19399,7 +19252,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +604,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19408,7 +19261,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +642,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19447,7 +19300,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +597,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -19456,7 +19309,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +635,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19495,7 +19348,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19504,7 +19357,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19543,7 +19396,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +606,7 @@
+@@ -606,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19552,7 +19405,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +644,9 @@
+@@ -644,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19591,7 +19444,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19600,7 +19453,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19639,7 +19492,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19648,7 +19501,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19660,45 +19513,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/html/Makefile.in
-+++ filters/kword/html/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,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@
-@@ -534,7 +537,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*) \
-@@ -572,9 +575,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- filters/kword/html/export/Makefile.in
+++ filters/kword/html/export/Makefile.in
@@ -1,4 +1,4 @@
@@ -19726,7 +19540,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19735,7 +19549,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19774,7 +19588,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19783,7 +19597,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19795,8 +19609,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/kword1.3/Makefile.in
-+++ filters/kword/kword1.3/Makefile.in
+--- filters/kword/html/Makefile.in
++++ filters/kword/html/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19813,7 +19627,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19822,7 +19636,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19861,7 +19675,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19870,7 +19684,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +627,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19882,8 +19696,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/latex/Makefile.in
-+++ filters/kword/latex/Makefile.in
+--- filters/kword/kword1.3/Makefile.in
++++ filters/kword/kword1.3/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19900,7 +19714,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -537,7 +540,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19909,7 +19723,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19948,7 +19762,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +615,7 @@
+@@ -615,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19957,7 +19771,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +653,9 @@
+@@ -653,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19969,24 +19783,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/latex/import/Makefile.in
-+++ filters/kword/latex/import/Makefile.in
+--- filters/kword/latex/import/generator/Makefile.in
++++ filters/kword/latex/import/generator/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -17,8 +17,6 @@
+@@ -18,8 +18,6 @@
+ ####### General stuff
-
--SOURCES = $(libkwordlateximport_la_SOURCES)
+-SOURCES = $(liblatexgenerator_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -301,6 +299,9 @@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19996,7 +19810,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +614,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20005,7 +19819,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +652,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20017,24 +19831,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/latex/import/generator/Makefile.in
-+++ filters/kword/latex/import/generator/Makefile.in
+--- filters/kword/latex/import/Makefile.in
++++ filters/kword/latex/import/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -18,8 +18,6 @@
- ####### General stuff
+@@ -17,8 +17,6 @@
--SOURCES = $(liblatexgenerator_la_SOURCES)
+
+-SOURCES = $(libkwordlateximport_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -301,6 +299,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20044,7 +19858,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +580,7 @@
+@@ -614,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20053,7 +19867,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +618,9 @@
+@@ -652,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20092,7 +19906,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +597,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20101,7 +19915,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +635,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20113,6 +19927,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- filters/kword/latex/Makefile.in
++++ filters/kword/latex/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- filters/kword/libexport/Makefile.in
+++ filters/kword/libexport/Makefile.in
@@ -1,4 +1,4 @@
@@ -20140,7 +19993,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20149,7 +20002,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20161,6 +20014,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- filters/kword/Makefile.in
++++ filters/kword/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -251,6 +251,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@
+@@ -541,7 +544,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -579,9 +582,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- filters/kword/msword/Makefile.in
+++ filters/kword/msword/Makefile.in
@@ -1,4 +1,4 @@
@@ -20188,7 +20080,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20197,7 +20089,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20236,7 +20128,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -621,7 +622,7 @@
+@@ -622,7 +623,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -20245,7 +20137,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -659,9 +660,9 @@
+@@ -660,9 +661,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20284,7 +20176,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -607,7 +608,7 @@
+@@ -608,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20293,7 +20185,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +646,9 @@
+@@ -646,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20332,7 +20224,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +601,7 @@
+@@ -601,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -20341,7 +20233,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +639,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20380,7 +20272,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +597,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20389,7 +20281,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +635,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20401,15 +20293,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/pdf/xpdf/Makefile.in
-+++ filters/kword/pdf/xpdf/Makefile.in
+--- filters/kword/pdf/xpdf/goo/Makefile.in
++++ filters/kword/pdf/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: 483858 $
# @configure_input@
-@@ -250,6 +250,9 @@
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libgoo_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20419,16 +20320,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
- all: docs-am all-recursive
+@@ -569,7 +570,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*) \
-@@ -573,9 +576,9 @@
+@@ -607,9 +608,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20439,25 +20340,16 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
---- filters/kword/pdf/xpdf/goo/Makefile.in
-+++ filters/kword/pdf/xpdf/goo/Makefile.in
+ clean-noinstLTLIBRARIES:
+--- filters/kword/pdf/xpdf/Makefile.in
++++ filters/kword/pdf/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: 483858 $
# @configure_input@
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libgoo_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -278,6 +276,9 @@
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20467,16 +20359,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +569,7 @@
+@@ -536,7 +539,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*) \
-@@ -606,9 +607,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20487,7 +20379,7 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
+ mostlyclean-libtool:
--- filters/kword/pdf/xpdf/xpdf/Makefile.in
+++ filters/kword/pdf/xpdf/xpdf/Makefile.in
@@ -1,4 +1,4 @@
@@ -20515,7 +20407,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +577,7 @@
+@@ -577,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20524,7 +20416,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +615,9 @@
+@@ -615,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20536,15 +20428,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- filters/kword/rtf/Makefile.in
-+++ filters/kword/rtf/Makefile.in
+--- filters/kword/rtf/export/Makefile.in
++++ filters/kword/rtf/export/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(librtfexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20554,16 +20455,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -586,7 +587,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*) \
-@@ -572,9 +575,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20573,10 +20474,10 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- filters/kword/rtf/export/Makefile.in
-+++ filters/kword/rtf/export/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kword/rtf/import/Makefile.in
++++ filters/kword/rtf/import/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20587,12 +20488,12 @@
--SOURCES = $(librtfexport_la_SOURCES)
+-SOURCES = $(librtfimport_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20602,16 +20503,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +624,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20623,24 +20524,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/rtf/import/Makefile.in
-+++ filters/kword/rtf/import/Makefile.in
+--- filters/kword/rtf/Makefile.in
++++ filters/kword/rtf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -19,8 +19,6 @@
-
-
-
--SOURCES = $(librtfimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20650,16 +20542,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -535,7 +538,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*) \
-@@ -624,9 +625,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20669,8 +20561,8 @@
-$(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:
--- filters/kword/starwriter/Makefile.in
+++ filters/kword/starwriter/Makefile.in
@@ -1,4 +1,4 @@
@@ -20698,7 +20590,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -20707,7 +20599,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20746,7 +20638,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +596,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -20755,7 +20647,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +634,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20767,15 +20659,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/wordperfect/Makefile.in
-+++ filters/kword/wordperfect/Makefile.in
+--- filters/kword/wordperfect/export/Makefile.in
++++ filters/kword/wordperfect/export/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libwpexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20785,16 +20686,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
- all: docs-am all-recursive
+@@ -582,7 +583,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20804,10 +20705,10 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- filters/kword/wordperfect/export/Makefile.in
-+++ filters/kword/wordperfect/export/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kword/wordperfect/import/Makefile.in
++++ filters/kword/wordperfect/import/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20818,12 +20719,12 @@
--SOURCES = $(libwpexport_la_SOURCES)
+-SOURCES = $(libwpimport_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20833,16 +20734,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .SUFFIXES: .cc .cxx .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20854,24 +20755,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/wordperfect/import/Makefile.in
-+++ filters/kword/wordperfect/import/Makefile.in
+--- filters/kword/wordperfect/Makefile.in
++++ filters/kword/wordperfect/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libwpimport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20881,16 +20773,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -536,7 +539,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*) \
-@@ -616,9 +617,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20900,8 +20792,8 @@
-$(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:
--- filters/libdialogfilter/Makefile.in
+++ filters/libdialogfilter/Makefile.in
@@ -1,4 +1,4 @@
@@ -20929,7 +20821,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -554,7 +555,7 @@
+@@ -555,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20938,7 +20830,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +593,9 @@
+@@ -593,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20977,7 +20869,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +557,7 @@
+@@ -557,7 +558,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20986,7 +20878,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +595,9 @@
+@@ -595,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20998,15 +20890,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- filters/xsltfilter/Makefile.in
-+++ filters/xsltfilter/Makefile.in
+--- filters/Makefile.in
++++ filters/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -252,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21016,16 +20908,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -548,7 +551,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)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -586,9 +589,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21064,7 +20956,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +609,7 @@
+@@ -609,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21073,7 +20965,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +647,9 @@
+@@ -647,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21085,8 +20977,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/xsltfilter/export/xsl/Makefile.in
-+++ filters/xsltfilter/export/xsl/Makefile.in
+--- filters/xsltfilter/export/xsl/kword/Makefile.in
++++ filters/xsltfilter/export/xsl/kword/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -21103,7 +20995,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21112,7 +21004,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21124,15 +21016,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- filters/xsltfilter/export/xsl/kword/Makefile.in
-+++ filters/xsltfilter/export/xsl/kword/Makefile.in
+--- filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
++++ filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21142,8 +21034,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -530,7 +533,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -21151,7 +21043,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21163,15 +21055,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
-+++ filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
+--- filters/xsltfilter/export/xsl/Makefile.in
++++ filters/xsltfilter/export/xsl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21181,8 +21073,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-am
+@@ -535,7 +538,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -21190,7 +21082,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21229,7 +21121,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21238,7 +21130,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21250,24 +21142,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- interfaces/Makefile.in
-+++ interfaces/Makefile.in
+--- filters/xsltfilter/Makefile.in
++++ filters/xsltfilter/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkochart_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -278,6 +276,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21277,16 +21160,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +573,7 @@
+@@ -535,7 +538,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +611,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21296,41 +21179,26 @@
-$(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)
---- karbon/Makefile.in
-+++ karbon/Makefile.in
+
+ mostlyclean-libtool:
+--- interfaces/Makefile.in
++++ interfaces/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -17,10 +17,6 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
-
--#>- SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) $(libkarbonpart_la_SOURCES)
--#>+ 1
--SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) $(libkarbonpart_la_SOURCES) $(karbon_SOURCES)
+-SOURCES = $(libkochart_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -137,8 +133,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
-+#>- $(libkarbonpart_la_SOURCES)
-+#>+ 2
- SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
-- $(libkarbonpart_la_SOURCES)
-+ $(libkarbonpart_la_SOURCES) $(karbon_SOURCES)
- #>- DIST_SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
- #>- $(libkarbonpart_la_SOURCES)
- #>+ 2
-@@ -345,6 +344,9 @@
+@@ -278,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21340,28 +21208,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -643,9 +645,9 @@
- #>- libkarboncommon_la_SOURCES = karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_part_iface.skel karbon_view.cc karbon_view_iface.cc karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc vtoolcontroller.cc vtool.cc
- #>+ 1
- libkarboncommon_la_SOURCES=karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_view.cc karbon_view_iface.cc karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc vtoolcontroller.cc vtool.cc karbon_part_iface_skel.cc karbon_view_iface_skel.cc
--#>- libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
-+#>- libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined
- #>+ 1
--libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
-+libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED)
- libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
- dockers/libkarbondockers.la \
- widgets/libkarbonwidgets.la \
-@@ -686,7 +688,7 @@
+@@ -573,7 +574,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
+ .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -724,9 +726,9 @@
+@@ -611,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21371,7 +21227,7 @@
-$(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)
--- karbon/commands/Makefile.in
+++ karbon/commands/Makefile.in
@@ -21400,7 +21256,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -620,7 +621,7 @@
+@@ -621,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21409,7 +21265,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -658,9 +659,9 @@
+@@ -659,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21448,7 +21304,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -674,7 +675,7 @@
+@@ -675,7 +676,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21457,7 +21313,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -712,9 +713,9 @@
+@@ -713,9 +714,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21487,7 +21343,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -543,7 +546,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21496,7 +21352,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -581,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21535,7 +21391,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +581,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21544,7 +21400,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +619,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21583,7 +21439,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +593,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21592,7 +21448,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +631,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21604,15 +21460,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- karbon/pics/Makefile.in
-+++ karbon/pics/Makefile.in
+--- karbon/Makefile.in
++++ karbon/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -233,6 +233,9 @@
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) $(libkarbonpart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) $(libkarbonpart_la_SOURCES) $(karbon_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -137,8 +133,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
++#>- $(libkarbonpart_la_SOURCES)
++#>+ 2
+ SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
+- $(libkarbonpart_la_SOURCES)
++ $(libkarbonpart_la_SOURCES) $(karbon_SOURCES)
+ #>- DIST_SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
+ #>- $(libkarbonpart_la_SOURCES)
+ #>+ 2
+@@ -345,6 +344,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21622,16 +21502,28 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
- all: docs-am all-am
+@@ -644,9 +646,9 @@
+ #>- libkarboncommon_la_SOURCES = karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_part_iface.skel karbon_view.cc karbon_view_iface.cc karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc vtoolcontroller.cc vtool.cc
+ #>+ 1
+ libkarboncommon_la_SOURCES=karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_view.cc karbon_view_iface.cc karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc vtoolcontroller.cc vtool.cc karbon_part_iface_skel.cc karbon_view_iface_skel.cc
+-#>- libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
++#>- libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined
+ #>+ 1
+-libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
++libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED)
+ libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
+ dockers/libkarbondockers.la \
+ widgets/libkarbonwidgets.la \
+@@ -687,7 +689,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -725,9 +727,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21641,17 +21533,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- karbon/plugins/Makefile.in
-+++ karbon/plugins/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- karbon/pics/Makefile.in
++++ karbon/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: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21661,8 +21553,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -521,7 +524,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -21670,7 +21562,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -559,9 +562,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21709,7 +21601,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +576,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21718,7 +21610,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +614,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21757,7 +21649,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +580,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21766,7 +21658,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +618,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21805,7 +21697,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +576,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21814,7 +21706,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +614,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21826,6 +21718,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- karbon/plugins/Makefile.in
++++ karbon/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: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- karbon/plugins/roundcorners/Makefile.in
+++ karbon/plugins/roundcorners/Makefile.in
@@ -1,4 +1,4 @@
@@ -21853,7 +21784,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +576,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21862,7 +21793,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +614,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21901,7 +21832,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +581,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21910,7 +21841,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +619,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21949,7 +21880,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +576,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21958,7 +21889,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +614,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21997,7 +21928,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +578,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22006,7 +21937,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +616,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22045,7 +21976,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -615,7 +616,7 @@
+@@ -616,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -22054,7 +21985,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +654,9 @@
+@@ -654,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22093,7 +22024,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -550,7 +551,7 @@
+@@ -551,7 +552,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -22102,7 +22033,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -588,9 +589,9 @@
+@@ -589,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22141,7 +22072,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22150,7 +22081,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22162,15 +22093,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- karbon/templates/Makefile.in
-+++ karbon/templates/Makefile.in
+--- karbon/templates/basic/Makefile.in
++++ karbon/templates/basic/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22180,8 +22111,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -536,7 +539,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -22189,7 +22120,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22201,15 +22132,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- karbon/templates/basic/Makefile.in
-+++ karbon/templates/basic/Makefile.in
+--- karbon/templates/Makefile.in
++++ karbon/templates/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -245,6 +245,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22220,7 +22151,7 @@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
@@ -535,7 +538,7 @@
- all: docs-am all-am
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -22267,7 +22198,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -643,7 +644,7 @@
+@@ -644,7 +645,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22276,7 +22207,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -681,9 +682,9 @@
+@@ -682,9 +683,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22315,7 +22246,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +585,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22324,7 +22255,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +623,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22363,7 +22294,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +615,7 @@
+@@ -615,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22372,7 +22303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +653,9 @@
+@@ -653,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22384,39 +22315,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kchart/Makefile.in
-+++ kchart/Makefile.in
+--- kchart/kdchart/Makefile.in
++++ kchart/kdchart/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -18,10 +18,6 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
-
--#>- SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) $(libkchartpart_la_SOURCES)
--#>+ 1
--SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) $(libkchartpart_la_SOURCES) $(kchart_SOURCES)
+-SOURCES = $(libkdchart_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -156,8 +152,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
-+#>- $(libkchartpart_la_SOURCES)
-+#>+ 2
- SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
-- $(libkchartpart_la_SOURCES)
-+ $(libkchartpart_la_SOURCES) $(kchart_SOURCES)
- #>- DIST_SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
- #>- $(libkchartpart_la_SOURCES)
- #>+ 2
-@@ -368,6 +367,9 @@
+@@ -306,6 +304,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22426,16 +22342,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -770,7 +772,7 @@
+@@ -673,7 +674,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ .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*) \
-@@ -808,9 +810,9 @@
+@@ -711,9 +712,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22445,26 +22361,41 @@
-$(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)
---- kchart/kdchart/Makefile.in
-+++ kchart/kdchart/Makefile.in
+--- kchart/Makefile.in
++++ kchart/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -16,8 +16,6 @@
- @SET_MAKE@
+@@ -18,10 +18,6 @@
--SOURCES = $(libkdchart_la_SOURCES)
+
+-#>- SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) $(libkchartpart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) $(libkchartpart_la_SOURCES) $(kchart_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -306,6 +304,9 @@
+@@ -156,8 +152,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
++#>- $(libkchartpart_la_SOURCES)
++#>+ 2
+ SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
+- $(libkchartpart_la_SOURCES)
++ $(libkchartpart_la_SOURCES) $(kchart_SOURCES)
+ #>- DIST_SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
+ #>- $(libkchartpart_la_SOURCES)
+ #>+ 2
+@@ -368,6 +367,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22474,16 +22405,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -672,7 +673,7 @@
+@@ -771,7 +773,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)
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -710,9 +711,9 @@
+@@ -809,9 +811,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22493,7 +22424,7 @@
-$(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)
--- kchart/pics/Makefile.in
+++ kchart/pics/Makefile.in
@@ -22513,7 +22444,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22522,7 +22453,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22552,7 +22483,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22561,7 +22492,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22573,15 +22504,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kchart/toolbar/Makefile.in
-+++ kchart/toolbar/Makefile.in
+--- kchart/toolbar/crystalsvg/Makefile.in
++++ kchart/toolbar/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: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22591,8 +22522,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
- all: docs-am all-recursive
+@@ -520,7 +523,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -22600,7 +22531,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22612,8 +22543,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kchart/toolbar/crystalsvg/Makefile.in
-+++ kchart/toolbar/crystalsvg/Makefile.in
+--- kchart/toolbar/locolor/Makefile.in
++++ kchart/toolbar/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.
@@ -22630,7 +22561,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22639,7 +22570,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22651,15 +22582,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kchart/toolbar/locolor/Makefile.in
-+++ kchart/toolbar/locolor/Makefile.in
+--- kchart/toolbar/Makefile.in
++++ kchart/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: 483858 $
# @configure_input@
-@@ -233,6 +233,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22669,8 +22600,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
- all: docs-am all-am
+@@ -537,7 +540,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -22678,7 +22609,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22717,7 +22648,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -625,7 +626,7 @@
+@@ -626,7 +627,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22726,7 +22657,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -663,9 +664,9 @@
+@@ -664,9 +665,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22738,45 +22669,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kexi/3rdparty/Makefile.in
-+++ kexi/3rdparty/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,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@
-@@ -534,7 +537,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*) \
-@@ -572,9 +575,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- kexi/3rdparty/kexisql/Makefile.in
+++ kexi/3rdparty/kexisql/Makefile.in
@@ -1,4 +1,4 @@
@@ -22795,7 +22687,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22804,7 +22696,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22843,7 +22735,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +599,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -22852,7 +22744,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +637,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22882,7 +22774,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -518,7 +521,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22891,7 +22783,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -556,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22921,7 +22813,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22930,7 +22822,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22969,7 +22861,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -638,7 +639,7 @@
+@@ -639,7 +640,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -22978,7 +22870,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -676,9 +677,9 @@
+@@ -677,9 +678,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23017,7 +22909,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -623,7 +624,7 @@
+@@ -624,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -23026,7 +22918,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -661,9 +662,9 @@
+@@ -662,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23038,24 +22930,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kexi/3rdparty/uuid/Makefile.in
-+++ kexi/3rdparty/uuid/Makefile.in
+--- kexi/3rdparty/Makefile.in
++++ kexi/3rdparty/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkexiuuid_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -275,6 +273,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23065,16 +22948,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -535,7 +538,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23085,38 +22968,25 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
---- kexi/Makefile.in
-+++ kexi/Makefile.in
+ mostlyclean-libtool:
+--- kexi/3rdparty/uuid/Makefile.in
++++ kexi/3rdparty/uuid/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -17,10 +17,6 @@
+@@ -15,8 +15,6 @@
+ @SET_MAKE@
-
--#>- SOURCES = $(kexi_la_SOURCES)
--#>+ 1
--SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
+-SOURCES = $(libkexiuuid_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -103,7 +99,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(kexi_la_SOURCES)
-+#>- SOURCES = $(kexi_la_SOURCES)
-+#>+ 1
-+SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
- #>- DIST_SOURCES = $(kexi_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
-@@ -309,6 +307,9 @@
+@@ -275,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23126,16 +22996,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -654,7 +655,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -692,9 +693,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23145,8 +23015,8 @@
-$(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)
+
+ clean-noinstLTLIBRARIES:
--- kexi/core/Makefile.in
+++ kexi/core/Makefile.in
@@ -1,4 +1,4 @@
@@ -23174,7 +23044,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -653,7 +654,7 @@
+@@ -654,7 +655,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23183,7 +23053,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -691,9 +692,9 @@
+@@ -692,9 +693,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23195,15 +23065,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/data/Makefile.in
-+++ kexi/data/Makefile.in
+--- kexi/data/kde34compat/Makefile.in
++++ kexi/data/kde34compat/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -267,6 +267,9 @@
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23213,16 +23083,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
- all: docs-am all-recursive
+@@ -538,7 +541,7 @@
+ all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23234,15 +23104,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kexi/data/kde34compat/Makefile.in
-+++ kexi/data/kde34compat/Makefile.in
+--- kexi/data/Makefile.in
++++ kexi/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: 483858 $
# @configure_input@
-@@ -245,6 +245,9 @@
+@@ -267,6 +267,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23252,16 +23122,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
- all: docs-am all-am
+@@ -610,7 +613,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)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -648,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23291,7 +23161,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -518,7 +521,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23300,7 +23170,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -556,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23312,8 +23182,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kexi/formeditor/Makefile.in
-+++ kexi/formeditor/Makefile.in
+--- kexi/formeditor/factories/Makefile.in
++++ kexi/formeditor/factories/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -23324,12 +23194,12 @@
@SET_MAKE@
--SOURCES = $(libkformdesigner_la_SOURCES)
+-SOURCES = $(kformdesigner_containers_la_SOURCES) $(kformdesigner_stdwidgets_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -310,6 +308,9 @@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23339,7 +23209,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -639,7 +640,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23348,7 +23218,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -677,9 +678,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23358,10 +23228,10 @@
-$(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)
---- kexi/formeditor/factories/Makefile.in
-+++ kexi/formeditor/factories/Makefile.in
+--- kexi/formeditor/kdevelop_plugin/Makefile.in
++++ kexi/formeditor/kdevelop_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.
@@ -23372,12 +23242,12 @@
@SET_MAKE@
--SOURCES = $(kformdesigner_containers_la_SOURCES) $(kformdesigner_stdwidgets_la_SOURCES)
+-SOURCES = $(libkformdesigner_kdev_part_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23387,7 +23257,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +604,7 @@
+@@ -602,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23396,7 +23266,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +642,9 @@
+@@ -640,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23408,8 +23278,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/formeditor/kdevelop_plugin/Makefile.in
-+++ kexi/formeditor/kdevelop_plugin/Makefile.in
+--- kexi/formeditor/Makefile.in
++++ kexi/formeditor/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -23420,12 +23290,12 @@
@SET_MAKE@
--SOURCES = $(libkformdesigner_kdev_part_la_SOURCES)
+-SOURCES = $(libkformdesigner_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -310,6 +308,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23435,7 +23305,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +602,7 @@
+@@ -640,7 +641,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23444,7 +23314,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +640,9 @@
+@@ -678,9 +679,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23454,7 +23324,7 @@
-$(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)
--- kexi/formeditor/scripting/Makefile.in
+++ kexi/formeditor/scripting/Makefile.in
@@ -23483,7 +23353,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +599,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23492,7 +23362,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +637,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23531,7 +23401,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -631,7 +632,7 @@
+@@ -632,7 +633,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23540,7 +23410,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -669,9 +670,9 @@
+@@ -670,9 +671,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23552,54 +23422,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/kexidb/Makefile.in
-+++ kexi/kexidb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(libkexidb_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -315,6 +313,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@
-@@ -642,7 +643,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -680,9 +681,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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)
--- kexi/kexidb/drivers/Makefile.in
+++ kexi/kexidb/drivers/Makefile.in
@@ -1,4 +1,4 @@
@@ -23618,7 +23440,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -537,7 +540,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -23627,7 +23449,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23666,7 +23488,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -612,7 +613,7 @@
+@@ -613,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23675,7 +23497,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -650,9 +651,9 @@
+@@ -651,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23714,7 +23536,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23723,7 +23545,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23762,7 +23584,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +607,7 @@
+@@ -607,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23771,7 +23593,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +645,9 @@
+@@ -645,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23810,7 +23632,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -607,7 +608,7 @@
+@@ -608,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23819,7 +23641,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +646,9 @@
+@@ -646,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23858,7 +23680,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -610,7 +611,7 @@
+@@ -611,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23867,7 +23689,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -648,9 +649,9 @@
+@@ -649,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23879,6 +23701,54 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- kexi/kexidb/Makefile.in
++++ kexi/kexidb/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkexidb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -315,6 +313,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@
+@@ -643,7 +644,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -681,9 +682,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- kexi/kexidb/parser/Makefile.in
+++ kexi/kexidb/parser/Makefile.in
@@ -1,4 +1,4 @@
@@ -23906,7 +23776,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23915,7 +23785,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +627,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23954,7 +23824,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +601,7 @@
+@@ -601,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23963,7 +23833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +639,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24002,7 +23872,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -644,7 +645,7 @@
+@@ -645,7 +646,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24011,7 +23881,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -682,9 +683,9 @@
+@@ -683,9 +684,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24050,7 +23920,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -624,7 +625,7 @@
+@@ -625,7 +626,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24059,7 +23929,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +663,9 @@
+@@ -663,9 +664,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24098,7 +23968,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -645,7 +646,7 @@
+@@ -646,7 +647,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24107,7 +23977,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -683,9 +684,9 @@
+@@ -684,9 +685,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24119,6 +23989,67 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+--- kexi/Makefile.in
++++ kexi/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(kexi_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -103,7 +99,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kexi_la_SOURCES)
++#>- SOURCES = $(kexi_la_SOURCES)
++#>+ 1
++SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
+ #>- DIST_SOURCES = $(kexi_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
+@@ -309,6 +307,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@
+@@ -655,7 +656,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -693,9 +694,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- kexi/migration/Makefile.in
+++ kexi/migration/Makefile.in
@@ -1,4 +1,4 @@
@@ -24146,7 +24077,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -656,7 +657,7 @@
+@@ -657,7 +658,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24155,7 +24086,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -694,9 +695,9 @@
+@@ -695,9 +696,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24194,7 +24125,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24203,7 +24134,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24242,7 +24173,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +596,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24251,7 +24182,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +634,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24290,7 +24221,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24299,7 +24230,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24329,7 +24260,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -569,7 +572,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24338,7 +24269,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -607,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24350,15 +24281,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kexi/plugins/Makefile.in
-+++ kexi/plugins/Makefile.in
+--- kexi/plugins/forms/Makefile.in
++++ kexi/plugins/forms/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -250,6 +250,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kexihandler_form_la_SOURCES) $(kformdesigner_kexidbwidgets_la_SOURCES) $(libkexiformutils_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -339,6 +337,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24368,16 +24308,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
- all: docs-am all-recursive
+@@ -687,7 +688,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -725,9 +726,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24387,26 +24327,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- kexi/plugins/forms/Makefile.in
-+++ kexi/plugins/forms/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kexi/plugins/forms/widgets/Makefile.in
++++ kexi/plugins/forms/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: 483858 $
# @configure_input@
-@@ -17,8 +17,6 @@
+@@ -15,8 +15,6 @@
+ @SET_MAKE@
-
--SOURCES = $(kexihandler_form_la_SOURCES) $(kformdesigner_kexidbwidgets_la_SOURCES) $(libkexiformutils_la_SOURCES)
+-SOURCES = $(libkexiformutilswidgets_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -339,6 +337,9 @@
+@@ -294,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24416,16 +24356,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -686,7 +687,7 @@
+@@ -620,7 +621,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -724,9 +725,9 @@
+@@ -658,9 +659,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24435,26 +24375,26 @@
-$(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)
---- kexi/plugins/forms/widgets/Makefile.in
-+++ kexi/plugins/forms/widgets/Makefile.in
+
+ clean-noinstLTLIBRARIES:
+--- kexi/plugins/importexport/csv/Makefile.in
++++ kexi/plugins/importexport/csv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -15,8 +15,6 @@
-
+@@ -16,8 +16,6 @@
@SET_MAKE@
--SOURCES = $(libkexiformutilswidgets_la_SOURCES)
+
+-SOURCES = $(kexihandler_csv_importexport_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -294,6 +292,9 @@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24464,16 +24404,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -619,7 +620,7 @@
+@@ -605,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -657,9 +658,9 @@
+@@ -643,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24483,8 +24423,8 @@
-$(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:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- kexi/plugins/importexport/Makefile.in
+++ kexi/plugins/importexport/Makefile.in
@@ -1,4 +1,4 @@
@@ -24503,7 +24443,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -24512,7 +24452,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24524,24 +24464,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kexi/plugins/importexport/csv/Makefile.in
-+++ kexi/plugins/importexport/csv/Makefile.in
+--- kexi/plugins/Makefile.in
++++ kexi/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: 483858 $
# @configure_input@
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kexihandler_csv_importexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24551,16 +24482,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +605,7 @@
+@@ -538,7 +541,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +643,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24570,8 +24501,8 @@
-$(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:
--- kexi/plugins/migration/Makefile.in
+++ kexi/plugins/migration/Makefile.in
@@ -1,4 +1,4 @@
@@ -24599,7 +24530,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24608,7 +24539,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24647,7 +24578,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +617,7 @@
+@@ -617,7 +618,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24656,7 +24587,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +655,9 @@
+@@ -655,9 +656,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24695,7 +24626,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +609,7 @@
+@@ -609,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24704,7 +24635,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +647,9 @@
+@@ -647,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24743,7 +24674,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -669,7 +670,7 @@
+@@ -670,7 +671,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24752,7 +24683,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -707,9 +708,9 @@
+@@ -708,9 +709,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24764,45 +24695,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/plugins/scripting/Makefile.in
-+++ kexi/plugins/scripting/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,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@
-@@ -534,7 +537,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*) \
-@@ -572,9 +575,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- kexi/plugins/scripting/kexiapp/Makefile.in
+++ kexi/plugins/scripting/kexiapp/Makefile.in
@@ -1,4 +1,4 @@
@@ -24830,7 +24722,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +614,7 @@
+@@ -614,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24839,7 +24731,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +652,9 @@
+@@ -652,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24878,7 +24770,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -629,7 +630,7 @@
+@@ -630,7 +631,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24887,7 +24779,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -667,9 +668,9 @@
+@@ -668,9 +669,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24926,7 +24818,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -632,7 +633,7 @@
+@@ -633,7 +634,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24935,7 +24827,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -670,9 +671,9 @@
+@@ -671,9 +672,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24947,8 +24839,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/plugins/scripting/scripts/Makefile.in
-+++ kexi/plugins/scripting/scripts/Makefile.in
+--- kexi/plugins/scripting/Makefile.in
++++ kexi/plugins/scripting/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -24965,7 +24857,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -24974,7 +24866,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25004,7 +24896,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25013,7 +24905,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25043,7 +24935,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25052,7 +24944,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25082,7 +24974,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25091,7 +24983,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25103,15 +24995,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-scriptsSCRIPTS: $(scripts_SCRIPTS)
@$(NORMAL_INSTALL)
---- kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
-+++ kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
+--- kexi/plugins/scripting/scripts/Makefile.in
++++ kexi/plugins/scripting/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -238,6 +238,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25121,16 +25013,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
- all: docs-am all-am
+@@ -535,7 +538,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25140,17 +25032,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-scriptsSCRIPTS: $(scripts_SCRIPTS)
- @$(NORMAL_INSTALL)
---- kexi/plugins/scripting/scripts/python/Makefile.in
-+++ kexi/plugins/scripting/scripts/python/Makefile.in
+
+ mostlyclean-libtool:
+--- kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
++++ kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -250,6 +250,9 @@
+@@ -238,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25160,8 +25052,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -550,7 +553,7 @@
- all: docs-am all-recursive
+@@ -540,7 +543,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
@@ -25169,7 +25061,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -588,9 +591,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25179,8 +25071,8 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-scriptsSCRIPTS: $(scripts_SCRIPTS)
+ @$(NORMAL_INSTALL)
--- kexi/plugins/scripting/scripts/python/kexiapp/Makefile.in
+++ kexi/plugins/scripting/scripts/python/kexiapp/Makefile.in
@@ -1,4 +1,4 @@
@@ -25199,7 +25091,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -524,7 +527,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25208,7 +25100,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -562,9 +565,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25220,6 +25112,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kexiapppythonSCRIPTS: $(kexiapppython_SCRIPTS)
@$(NORMAL_INSTALL)
+--- kexi/plugins/scripting/scripts/python/Makefile.in
++++ kexi/plugins/scripting/scripts/python/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -250,6 +250,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@
+@@ -551,7 +554,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -589,9 +592,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- kexi/plugins/tables/Makefile.in
+++ kexi/plugins/tables/Makefile.in
@@ -1,4 +1,4 @@
@@ -25247,7 +25178,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +609,7 @@
+@@ -609,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25256,7 +25187,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +647,9 @@
+@@ -647,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25286,7 +25217,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25295,7 +25226,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25334,7 +25265,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +601,7 @@
+@@ -601,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25343,7 +25274,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +639,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25382,7 +25313,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25391,7 +25322,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25430,7 +25361,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +597,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25439,7 +25370,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +635,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25478,7 +25409,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25487,7 +25418,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25526,7 +25457,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25535,7 +25466,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25574,7 +25505,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -667,7 +668,7 @@
+@@ -668,7 +669,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25583,7 +25514,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -705,9 +706,9 @@
+@@ -706,9 +707,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25622,7 +25553,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -629,7 +630,7 @@
+@@ -630,7 +631,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25631,7 +25562,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -667,9 +668,9 @@
+@@ -668,9 +669,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25670,7 +25601,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -655,7 +656,7 @@
+@@ -656,7 +657,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25679,7 +25610,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -693,9 +694,9 @@
+@@ -694,9 +695,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25718,7 +25649,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +612,7 @@
+@@ -612,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25727,7 +25658,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +650,9 @@
+@@ -650,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25779,7 +25710,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -653,7 +654,7 @@
+@@ -654,7 +655,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -25788,7 +25719,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -691,9 +692,9 @@
+@@ -692,9 +693,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25818,7 +25749,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25827,7 +25758,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25839,78 +25770,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kivio/Makefile.in
-+++ kivio/Makefile.in
+--- kivio/kiviopart/config/Makefile.in
++++ kivio/kiviopart/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: 483858 $
# @configure_input@
-@@ -250,6 +250,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@
-@@ -535,7 +538,7 @@
- all: docs-am all-recursive
+@@ -17,8 +17,6 @@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -573,9 +576,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
---- kivio/kiviopart/Makefile.in
-+++ kivio/kiviopart/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,10 +18,6 @@
-
-
-
--#>- SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) $(libkiviopart_la_SOURCES)
--#>+ 1
--SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) $(libkiviopart_la_SOURCES) $(kivio_SOURCES)
+-SOURCES = $(libkivioconfig_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -150,8 +146,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
-+#>- $(libkiviopart_la_SOURCES)
-+#>+ 2
- SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
-- $(libkiviopart_la_SOURCES)
-+ $(libkiviopart_la_SOURCES) $(kivio_SOURCES)
- #>- DIST_SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
- #>- $(libkiviopart_la_SOURCES)
- #>+ 2
-@@ -362,6 +361,9 @@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25920,16 +25797,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -715,7 +717,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .cpp .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*) \
-@@ -753,9 +755,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25939,26 +25816,26 @@
-$(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)
---- kivio/kiviopart/config/Makefile.in
-+++ kivio/kiviopart/config/Makefile.in
+
+ clean-noinstLTLIBRARIES:
+--- kivio/kiviopart/kiviosdk/Makefile.in
++++ kivio/kiviopart/kiviosdk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -17,8 +17,6 @@
+@@ -15,8 +15,6 @@
+ @SET_MAKE@
-
--SOURCES = $(libkivioconfig_la_SOURCES)
+-SOURCES = $(libkiviosdk_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -294,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25968,7 +25845,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +580,7 @@
+@@ -623,7 +624,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25977,7 +25854,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +618,9 @@
+@@ -661,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25989,24 +25866,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kivio/kiviopart/kiviosdk/Makefile.in
-+++ kivio/kiviopart/kiviosdk/Makefile.in
+--- kivio/kiviopart/Makefile.in
++++ kivio/kiviopart/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -15,8 +15,6 @@
+@@ -18,10 +18,6 @@
- @SET_MAKE@
--SOURCES = $(libkiviosdk_la_SOURCES)
+
+-#>- SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) $(libkiviopart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) $(libkiviopart_la_SOURCES) $(kivio_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -294,6 +292,9 @@
+@@ -150,8 +146,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
++#>- $(libkiviopart_la_SOURCES)
++#>+ 2
+ SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
+- $(libkiviopart_la_SOURCES)
++ $(libkiviopart_la_SOURCES) $(kivio_SOURCES)
+ #>- DIST_SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
+ #>- $(libkiviopart_la_SOURCES)
+ #>+ 2
+@@ -362,6 +361,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26016,16 +25908,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -622,7 +623,7 @@
+@@ -716,7 +718,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .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*) \
-@@ -660,9 +661,9 @@
+@@ -754,9 +756,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26035,8 +25927,8 @@
-$(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:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- kivio/kiviopart/pics/Makefile.in
+++ kivio/kiviopart/pics/Makefile.in
@@ -1,4 +1,4 @@
@@ -26055,7 +25947,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26064,7 +25956,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26094,7 +25986,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -617,7 +620,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26103,7 +25995,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -655,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26133,7 +26025,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -597,7 +600,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26142,7 +26034,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26172,7 +26064,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -978,7 +981,7 @@
+@@ -979,7 +982,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26181,7 +26073,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -1016,9 +1019,9 @@
+@@ -1017,9 +1020,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26211,7 +26103,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -589,7 +592,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26220,7 +26112,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -627,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26250,7 +26142,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -569,7 +572,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26259,7 +26151,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -607,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26289,7 +26181,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -553,7 +556,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26298,7 +26190,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -591,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26328,7 +26220,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -569,7 +572,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26337,7 +26229,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -607,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26349,15 +26241,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kivio/kiviopart/stencils/Dia/MSE/Makefile.in
-+++ kivio/kiviopart/stencils/Dia/MSE/Makefile.in
+--- kivio/kiviopart/stencils/Dia/Makefile.in
++++ kivio/kiviopart/stencils/Dia/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26367,8 +26259,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -548,7 +551,7 @@
- all: docs-am all-am
+@@ -550,7 +553,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -26376,7 +26268,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +589,9 @@
+@@ -588,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26388,15 +26280,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kivio/kiviopart/stencils/Dia/Makefile.in
-+++ kivio/kiviopart/stencils/Dia/Makefile.in
+--- kivio/kiviopart/stencils/Dia/MSE/Makefile.in
++++ kivio/kiviopart/stencils/Dia/MSE/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -259,6 +259,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26407,7 +26299,7 @@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
@@ -549,7 +552,7 @@
- all: docs-am all-recursive
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -26445,7 +26337,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -599,7 +602,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26454,7 +26346,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -637,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26484,7 +26376,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -577,7 +580,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26493,7 +26385,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -615,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26523,7 +26415,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
+@@ -571,7 +574,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26532,7 +26424,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -608,9 +611,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26562,7 +26454,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -548,7 +551,7 @@
+@@ -549,7 +552,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26571,7 +26463,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +589,9 @@
+@@ -587,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26601,7 +26493,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -572,7 +575,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26610,7 +26502,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -610,9 +613,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26640,7 +26532,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26649,7 +26541,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26679,7 +26571,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26688,7 +26580,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26718,7 +26610,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -546,7 +549,7 @@
+@@ -547,7 +550,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26727,7 +26619,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -584,9 +587,9 @@
+@@ -585,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26757,7 +26649,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -569,7 +572,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26766,7 +26658,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -607,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26796,7 +26688,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -546,7 +549,7 @@
+@@ -547,7 +550,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26805,7 +26697,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -584,9 +587,9 @@
+@@ -585,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26835,7 +26727,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -537,7 +540,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26844,7 +26736,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26874,7 +26766,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -565,7 +568,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26883,7 +26775,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -603,9 +606,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26913,7 +26805,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -546,7 +549,7 @@
+@@ -547,7 +550,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26922,7 +26814,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -584,9 +587,9 @@
+@@ -585,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26952,7 +26844,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26961,7 +26853,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26991,7 +26883,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -27000,7 +26892,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27030,7 +26922,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -543,7 +546,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27039,7 +26931,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -581,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27069,7 +26961,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27078,7 +26970,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27108,7 +27000,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -532,7 +535,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27117,7 +27009,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -570,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27147,7 +27039,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -546,7 +549,7 @@
+@@ -547,7 +550,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -27156,7 +27048,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -584,9 +587,9 @@
+@@ -585,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27186,7 +27078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -557,7 +560,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27195,7 +27087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -595,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27225,7 +27117,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -548,7 +551,7 @@
+@@ -549,7 +552,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27234,7 +27126,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +589,9 @@
+@@ -587,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27264,7 +27156,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27273,7 +27165,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27303,7 +27195,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -557,7 +560,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27312,7 +27204,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -595,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27342,7 +27234,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -557,7 +560,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27351,7 +27243,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -595,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27381,7 +27273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -550,7 +553,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -27390,7 +27282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -588,9 +591,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27420,7 +27312,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27429,7 +27321,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27468,7 +27360,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27477,7 +27369,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +624,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27516,7 +27408,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +596,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27525,7 +27417,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +634,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27537,15 +27429,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kivio/plugins/Makefile.in
-+++ kivio/plugins/Makefile.in
+--- kivio/Makefile.in
++++ kivio/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27555,16 +27447,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -536,7 +539,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)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27603,7 +27495,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -622,7 +623,7 @@
+@@ -623,7 +624,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27612,7 +27504,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -660,9 +661,9 @@
+@@ -661,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27651,7 +27543,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27660,7 +27552,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27699,7 +27591,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +612,7 @@
+@@ -612,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27708,7 +27600,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +650,9 @@
+@@ -650,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27738,7 +27630,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -538,7 +541,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27747,7 +27639,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27786,7 +27678,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +602,7 @@
+@@ -602,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27795,7 +27687,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +640,9 @@
+@@ -640,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27834,7 +27726,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +577,7 @@
+@@ -577,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27843,7 +27735,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +615,9 @@
+@@ -615,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27882,7 +27774,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27891,7 +27783,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27930,7 +27822,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +614,7 @@
+@@ -614,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27939,7 +27831,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +652,9 @@
+@@ -652,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27978,7 +27870,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +612,7 @@
+@@ -612,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27987,7 +27879,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +650,9 @@
+@@ -650,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28017,7 +27909,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -546,7 +549,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -28026,7 +27918,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -584,9 +587,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28038,8 +27930,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kivio/templates/Makefile.in
-+++ kivio/templates/Makefile.in
+--- kivio/plugins/Makefile.in
++++ kivio/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.
@@ -28056,7 +27948,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -28065,7 +27957,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28095,7 +27987,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -28104,6 +27996,45 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -574,9 +577,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kivio/templates/Makefile.in
++++ kivio/templates/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,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@
+@@ -535,7 +538,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*) \
@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28156,7 +28087,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +605,7 @@
+@@ -605,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -28165,7 +28096,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +643,9 @@
+@@ -643,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28204,7 +28135,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +576,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -28213,7 +28144,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +614,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28265,7 +28196,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -823,7 +824,7 @@
+@@ -824,7 +825,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -28274,7 +28205,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -861,9 +862,9 @@
+@@ -862,9 +863,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28304,7 +28235,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -28313,7 +28244,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28343,7 +28274,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -28352,7 +28283,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28382,7 +28313,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -28391,7 +28322,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28421,7 +28352,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -28430,7 +28361,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28469,7 +28400,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +584,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28478,7 +28409,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +622,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28508,7 +28439,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -28517,7 +28448,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28529,39 +28460,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/Makefile.in
-+++ kpresenter/Makefile.in
+--- kpresenter/autoformEdit/Makefile.in
++++ kpresenter/autoformEdit/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -18,10 +18,6 @@
+@@ -17,8 +17,6 @@
+ ####### General stuff
-
--#>- SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) $(libkpresenterprivate_la_SOURCES)
--#>+ 1
--SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) $(libkpresenterprivate_la_SOURCES) $(kpresenter_SOURCES)
+-SOURCES = $(libaf_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -193,8 +189,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) \
-+#>- $(libkpresenterprivate_la_SOURCES)
-+#>+ 2
- SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) \
-- $(libkpresenterprivate_la_SOURCES)
-+ $(libkpresenterprivate_la_SOURCES) $(kpresenter_SOURCES)
- #>- DIST_SOURCES = $(kpresenter_la_SOURCES) \
- #>- $(libkpresenterpart_la_SOURCES) \
- #>- $(libkpresenterprivate_la_SOURCES)
-@@ -406,6 +405,9 @@
+@@ -270,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28571,16 +28487,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -845,7 +847,7 @@
+@@ -562,7 +563,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -883,9 +885,9 @@
+@@ -600,9 +601,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28590,26 +28506,17 @@
-$(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)
---- kpresenter/autoformEdit/Makefile.in
-+++ kpresenter/autoformEdit/Makefile.in
+
+ clean-noinstLTLIBRARIES:
+--- kpresenter/autoforms/Arrows/Makefile.in
++++ kpresenter/autoforms/Arrows/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -17,8 +17,6 @@
-
- ####### General stuff
-
--SOURCES = $(libaf_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -270,6 +268,9 @@
+@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28619,16 +28526,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -561,7 +562,7 @@
+@@ -549,7 +552,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*) \
-@@ -599,9 +600,9 @@
+@@ -587,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28639,9 +28546,9 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
---- kpresenter/autoforms/Arrows/Makefile.in
-+++ kpresenter/autoforms/Arrows/Makefile.in
+ mostlyclean-libtool:
+--- kpresenter/autoforms/Connections/Makefile.in
++++ kpresenter/autoforms/Connections/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -28658,7 +28565,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -548,7 +551,7 @@
+@@ -555,7 +558,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -28667,7 +28574,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +589,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28679,15 +28586,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/autoforms/Connections/Makefile.in
-+++ kpresenter/autoforms/Connections/Makefile.in
+--- kpresenter/autoforms/Makefile.in
++++ kpresenter/autoforms/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -246,6 +246,9 @@
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28697,8 +28604,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
- all: docs-am all-am
+@@ -547,7 +550,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -28706,7 +28613,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -585,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28718,15 +28625,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/autoforms/Makefile.in
-+++ kpresenter/autoforms/Makefile.in
+--- kpresenter/dtd/Makefile.in
++++ kpresenter/dtd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -259,6 +259,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28736,8 +28643,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -546,7 +549,7 @@
- all: docs-am all-recursive
+@@ -530,7 +533,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -28745,7 +28652,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -584,9 +587,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28757,15 +28664,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/dtd/Makefile.in
-+++ kpresenter/dtd/Makefile.in
+--- kpresenter/Makefile.in
++++ kpresenter/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) $(libkpresenterprivate_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) $(libkpresenterprivate_la_SOURCES) $(kpresenter_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -193,8 +189,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) \
++#>- $(libkpresenterprivate_la_SOURCES)
++#>+ 2
+ SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) \
+- $(libkpresenterprivate_la_SOURCES)
++ $(libkpresenterprivate_la_SOURCES) $(kpresenter_SOURCES)
+ #>- DIST_SOURCES = $(kpresenter_la_SOURCES) \
+ #>- $(libkpresenterpart_la_SOURCES) \
+ #>- $(libkpresenterprivate_la_SOURCES)
+@@ -406,6 +405,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28775,16 +28706,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-am
+@@ -846,7 +848,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -884,9 +886,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28794,8 +28725,8 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- kpresenter/pics/Makefile.in
+++ kpresenter/pics/Makefile.in
@@ -1,4 +1,4 @@
@@ -28814,7 +28745,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -547,7 +550,7 @@
+@@ -548,7 +551,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -28823,7 +28754,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +588,9 @@
+@@ -586,9 +589,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28853,7 +28784,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -532,7 +535,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -28862,7 +28793,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -570,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28892,7 +28823,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -530,7 +533,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -28901,7 +28832,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28931,7 +28862,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -28940,7 +28871,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28952,15 +28883,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/Makefile.in
-+++ kpresenter/templates/Makefile.in
+--- kpresenter/templates/common_icon/Makefile.in
++++ kpresenter/templates/common_icon/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28970,8 +28901,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -520,7 +523,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -28979,7 +28910,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28991,8 +28922,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/Screen/Makefile.in
-+++ kpresenter/templates/Screen/Makefile.in
+--- kpresenter/templates/legal/Makefile.in
++++ kpresenter/templates/legal/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -29009,7 +28940,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29018,7 +28949,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29030,15 +28961,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/Screenpresentations/Makefile.in
-+++ kpresenter/templates/Screenpresentations/Makefile.in
+--- kpresenter/templates/letter/Makefile.in
++++ kpresenter/templates/letter/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -245,6 +245,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29048,7 +28979,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29057,7 +28988,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29069,15 +29000,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/common_icon/Makefile.in
-+++ kpresenter/templates/common_icon/Makefile.in
+--- kpresenter/templates/Makefile.in
++++ kpresenter/templates/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -233,6 +233,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29087,8 +29018,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
- all: docs-am all-am
+@@ -535,7 +538,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -29096,7 +29027,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29108,8 +29039,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/legal/Makefile.in
-+++ kpresenter/templates/legal/Makefile.in
+--- kpresenter/templates/Screen/Makefile.in
++++ kpresenter/templates/Screen/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -29126,7 +29057,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29135,7 +29066,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29147,15 +29078,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/letter/Makefile.in
-+++ kpresenter/templates/letter/Makefile.in
+--- kpresenter/templates/Screenpresentations/Makefile.in
++++ kpresenter/templates/Screenpresentations/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29165,7 +29096,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -545,7 +548,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29174,7 +29105,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -583,9 +586,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29204,7 +29135,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29213,7 +29144,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29225,7 +29156,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -808,9 +811,9 @@
+@@ -809,9 +812,9 @@
$(INSTALL_DATA) $(srcdir)/cr22-action-edit_picture.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/edit_picture.png
$(INSTALL_DATA) $(srcdir)/cr22-action-webpres.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/webpres.png
$(INSTALL_DATA) $(srcdir)/cr22-action-line_end.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/line_end.png
@@ -29236,7 +29167,7 @@
$(INSTALL_DATA) $(srcdir)/cr16-action-closed_cubicbeziercurve.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/closed_cubicbeziercurve.png
$(INSTALL_DATA) $(srcdir)/cr16-action-freehand.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/freehand.png
$(INSTALL_DATA) $(srcdir)/cr22-action-pgnum.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/pgnum.png
-@@ -935,9 +938,9 @@
+@@ -936,9 +939,9 @@
-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/edit_picture.png
-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/webpres.png
-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/line_end.png
@@ -29247,108 +29178,6 @@
-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/closed_cubicbeziercurve.png
-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/freehand.png
-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/pgnum.png
---- krita/Makefile.in
-+++ krita/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -17,10 +17,6 @@
-
-
-
--#>- SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) $(libkritapart_la_SOURCES)
--#>+ 1
--SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) $(libkritapart_la_SOURCES) $(krita_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -121,8 +117,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
-+#>- $(libkritapart_la_SOURCES)
-+#>+ 2
- SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
-- $(libkritapart_la_SOURCES)
-+ $(libkritapart_la_SOURCES) $(krita_SOURCES)
- #>- DIST_SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
- #>- $(libkritapart_la_SOURCES)
- #>+ 2
-@@ -332,6 +331,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@
-@@ -644,7 +646,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -682,9 +684,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- krita/colorspaces/Makefile.in
-+++ krita/colorspaces/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -252,6 +252,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@
-@@ -544,7 +547,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*) \
-@@ -582,9 +585,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- krita/colorspaces/cmyk_u16/Makefile.in
+++ krita/colorspaces/cmyk_u16/Makefile.in
@@ -1,4 +1,4 @@
@@ -29376,7 +29205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -612,7 +613,7 @@
+@@ -613,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29385,7 +29214,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -650,9 +651,9 @@
+@@ -651,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29424,7 +29253,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +597,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29433,7 +29262,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +635,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29463,7 +29292,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29472,7 +29301,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29511,7 +29340,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +614,7 @@
+@@ -614,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29520,7 +29349,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +652,9 @@
+@@ -652,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29559,7 +29388,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +609,7 @@
+@@ -609,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29568,7 +29397,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +647,9 @@
+@@ -647,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29598,7 +29427,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29607,7 +29436,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29646,7 +29475,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +564,7 @@
+@@ -564,7 +565,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29655,7 +29484,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +602,9 @@
+@@ -602,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29694,7 +29523,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +600,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29703,7 +29532,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +638,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29715,6 +29544,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- krita/colorspaces/Makefile.in
++++ krita/colorspaces/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -252,6 +252,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@
+@@ -545,7 +548,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*) \
+@@ -583,9 +586,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
--- krita/colorspaces/rgb_f16half/Makefile.in
+++ krita/colorspaces/rgb_f16half/Makefile.in
@@ -1,4 +1,4 @@
@@ -29742,7 +29610,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -618,7 +619,7 @@
+@@ -619,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29751,7 +29619,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -656,9 +657,9 @@
+@@ -657,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29790,7 +29658,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +568,7 @@
+@@ -568,7 +569,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29799,7 +29667,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +606,9 @@
+@@ -606,9 +607,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29838,7 +29706,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -615,7 +616,7 @@
+@@ -616,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29847,7 +29715,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +654,9 @@
+@@ -654,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29886,7 +29754,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +564,7 @@
+@@ -564,7 +565,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29895,7 +29763,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +602,9 @@
+@@ -602,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29934,7 +29802,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +615,7 @@
+@@ -615,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29943,7 +29811,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +653,9 @@
+@@ -653,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29982,7 +29850,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +564,7 @@
+@@ -564,7 +565,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29991,7 +29859,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +602,9 @@
+@@ -602,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30030,7 +29898,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -612,7 +613,7 @@
+@@ -613,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -30039,7 +29907,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -650,9 +651,9 @@
+@@ -651,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30069,7 +29937,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -30078,7 +29946,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30117,7 +29985,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -565,7 +566,7 @@
+@@ -566,7 +567,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30126,7 +29994,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -603,9 +604,9 @@
+@@ -604,9 +605,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30165,7 +30033,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +601,7 @@
+@@ -601,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -30174,7 +30042,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +639,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30186,8 +30054,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/colorspaces/wetsticky/Makefile.in
-+++ krita/colorspaces/wetsticky/Makefile.in
+--- krita/colorspaces/wetsticky/brushop/Makefile.in
++++ krita/colorspaces/wetsticky/brushop/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -30198,12 +30066,12 @@
--SOURCES = $(kritawsplugin_la_SOURCES)
+-SOURCES = $(kritawsbrushpaintop_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -299,6 +297,9 @@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30213,7 +30081,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +604,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -30222,7 +30090,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +642,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30234,8 +30102,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/colorspaces/wetsticky/brushop/Makefile.in
-+++ krita/colorspaces/wetsticky/brushop/Makefile.in
+--- krita/colorspaces/wetsticky/Makefile.in
++++ krita/colorspaces/wetsticky/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -30246,12 +30114,12 @@
--SOURCES = $(kritawsbrushpaintop_la_SOURCES)
+-SOURCES = $(kritawsplugin_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -299,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30261,7 +30129,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +598,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -30270,7 +30138,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +636,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30309,7 +30177,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -692,7 +693,7 @@
+@@ -693,7 +694,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -30318,7 +30186,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -730,9 +731,9 @@
+@@ -731,9 +732,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30357,7 +30225,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -30366,7 +30234,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30405,7 +30273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +599,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -30414,7 +30282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +637,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30453,7 +30321,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +564,7 @@
+@@ -564,7 +565,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30462,7 +30330,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +602,9 @@
+@@ -602,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30474,15 +30342,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkLTLIBRARIES:
---- krita/data/Makefile.in
-+++ krita/data/Makefile.in
+--- krita/data/brushes/Makefile.in
++++ krita/data/brushes/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -259,6 +259,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30492,8 +30360,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -550,7 +553,7 @@
- all: docs-am all-recursive
+@@ -597,7 +600,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -30501,7 +30369,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -588,9 +591,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30513,8 +30381,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- krita/data/brushes/Makefile.in
-+++ krita/data/brushes/Makefile.in
+--- krita/data/gradients/Makefile.in
++++ krita/data/gradients/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -30531,7 +30399,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -557,7 +560,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -30540,7 +30408,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -595,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30552,8 +30420,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- krita/data/gradients/Makefile.in
-+++ krita/data/gradients/Makefile.in
+--- krita/data/images/Makefile.in
++++ krita/data/images/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -30570,7 +30438,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -532,7 +535,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -30579,7 +30447,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -570,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30591,15 +30459,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- krita/data/images/Makefile.in
-+++ krita/data/images/Makefile.in
+--- krita/data/Makefile.in
++++ krita/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: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30609,8 +30477,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
- all: docs-am all-am
+@@ -551,7 +554,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -30618,7 +30486,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30648,7 +30516,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -578,7 +581,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -30657,7 +30525,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -616,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30687,7 +30555,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -530,7 +533,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -30696,7 +30564,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30726,7 +30594,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -530,7 +533,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -30735,7 +30603,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30765,7 +30633,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -530,7 +533,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -30774,7 +30642,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30786,24 +30654,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- krita/kritacolor/Makefile.in
-+++ krita/kritacolor/Makefile.in
+--- krita/kritacolor/colorspaces/Makefile.in
++++ krita/kritacolor/colorspaces/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -17,8 +17,6 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
-
--SOURCES = $(libkritacolor_la_SOURCES)
+-SOURCES = $(libkritacolorspaces_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -319,6 +317,9 @@
+@@ -274,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30813,7 +30681,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -644,7 +645,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -30822,7 +30690,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -682,9 +683,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30832,26 +30700,26 @@
-$(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)
---- krita/kritacolor/colorspaces/Makefile.in
-+++ krita/kritacolor/colorspaces/Makefile.in
+
+ clean-noinstLTLIBRARIES:
+--- krita/kritacolor/Makefile.in
++++ krita/kritacolor/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -16,8 +16,6 @@
- @SET_MAKE@
+@@ -17,8 +17,6 @@
--SOURCES = $(libkritacolorspaces_la_SOURCES)
+
+-SOURCES = $(libkritacolor_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -274,6 +272,9 @@
+@@ -319,6 +317,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30861,7 +30729,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +576,7 @@
+@@ -646,7 +647,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -30870,7 +30738,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +614,9 @@
+@@ -684,9 +685,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30880,8 +30748,8 @@
-$(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:
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- krita/kritacolor/tests/Makefile.in
+++ krita/kritacolor/tests/Makefile.in
@@ -1,4 +1,4 @@
@@ -30909,7 +30777,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +564,7 @@
+@@ -564,7 +565,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30918,7 +30786,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +602,9 @@
+@@ -602,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30930,54 +30798,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkLTLIBRARIES:
---- krita/pics/Makefile.in
-+++ krita/pics/Makefile.in
+--- krita/Makefile.in
++++ krita/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -243,6 +243,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@
-@@ -544,7 +547,7 @@
- all: docs-am all-am
+@@ -17,10 +17,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*) \
-@@ -582,9 +585,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
---- krita/plugins/Makefile.in
-+++ krita/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: 483858 $
- # @configure_input@
-
-@@ -249,6 +249,9 @@
+-#>- SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) $(libkritapart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) $(libkritapart_la_SOURCES) $(krita_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -121,8 +117,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
++#>- $(libkritapart_la_SOURCES)
++#>+ 2
+ SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
+- $(libkritapart_la_SOURCES)
++ $(libkritapart_la_SOURCES) $(krita_SOURCES)
+ #>- DIST_SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
+ #>- $(libkritapart_la_SOURCES)
+ #>+ 2
+@@ -332,6 +331,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30987,16 +30840,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
- all: docs-am all-recursive
+@@ -645,7 +647,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -683,9 +685,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31006,17 +30859,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- krita/plugins/filters/Makefile.in
-+++ krita/plugins/filters/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- krita/pics/Makefile.in
++++ krita/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: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31026,8 +30879,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -548,7 +551,7 @@
- all: docs-am all-recursive
+@@ -545,7 +548,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -31035,7 +30888,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +589,9 @@
+@@ -583,9 +586,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31074,7 +30927,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +585,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31083,7 +30936,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +623,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31122,7 +30975,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +604,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31131,7 +30984,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +642,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31170,7 +31023,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +599,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31179,7 +31032,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +637,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31218,7 +31071,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +605,7 @@
+@@ -605,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31227,7 +31080,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +643,9 @@
+@@ -643,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31266,7 +31119,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31275,7 +31128,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31314,7 +31167,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +591,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31323,7 +31176,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +629,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31362,7 +31215,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +581,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31371,7 +31224,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +619,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31410,7 +31263,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -31419,7 +31272,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31431,6 +31284,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- krita/plugins/filters/Makefile.in
++++ krita/plugins/filters/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,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@
+@@ -549,7 +552,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*) \
+@@ -587,9 +590,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
--- krita/plugins/filters/oilpaintfilter/Makefile.in
+++ krita/plugins/filters/oilpaintfilter/Makefile.in
@@ -1,4 +1,4 @@
@@ -31458,7 +31350,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +591,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31467,7 +31359,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +629,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31506,7 +31398,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +591,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31515,7 +31407,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +629,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31554,7 +31446,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31563,7 +31455,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31602,7 +31494,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31611,7 +31503,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31650,7 +31542,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31659,7 +31551,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31698,7 +31590,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31707,7 +31599,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31746,7 +31638,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +580,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31755,7 +31647,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +618,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31767,8 +31659,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/paintops/Makefile.in
-+++ krita/plugins/paintops/Makefile.in
+--- krita/plugins/Makefile.in
++++ krita/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.
@@ -31785,7 +31677,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -31794,7 +31686,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31833,7 +31725,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -607,7 +608,7 @@
+@@ -608,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31842,7 +31734,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +646,9 @@
+@@ -646,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31854,24 +31746,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/paintops/smearybrush/Makefile.in
-+++ krita/plugins/paintops/smearybrush/Makefile.in
+--- krita/plugins/paintops/Makefile.in
++++ krita/plugins/paintops/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kritasmearybrush_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31881,16 +31764,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -538,7 +541,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*) \
-@@ -626,9 +627,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31900,17 +31783,26 @@
-$(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)
---- krita/plugins/tools/Makefile.in
-+++ krita/plugins/tools/Makefile.in
+
+ mostlyclean-libtool:
+--- krita/plugins/paintops/smearybrush/Makefile.in
++++ krita/plugins/paintops/smearybrush/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritasmearybrush_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31920,16 +31812,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
- all: docs-am all-recursive
+@@ -589,7 +590,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31939,8 +31831,8 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- krita/plugins/tools/defaulttools/Makefile.in
+++ krita/plugins/tools/defaulttools/Makefile.in
@@ -1,4 +1,4 @@
@@ -31968,7 +31860,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -663,7 +664,7 @@
+@@ -664,7 +665,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -31977,7 +31869,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -701,9 +702,9 @@
+@@ -702,9 +703,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31989,6 +31881,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- krita/plugins/tools/Makefile.in
++++ krita/plugins/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: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,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@
+@@ -545,7 +548,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*) \
+@@ -583,9 +586,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
--- krita/plugins/tools/selectiontools/Makefile.in
+++ krita/plugins/tools/selectiontools/Makefile.in
@@ -1,4 +1,4 @@
@@ -32016,7 +31947,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -629,7 +630,7 @@
+@@ -630,7 +631,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32025,7 +31956,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -667,9 +668,9 @@
+@@ -668,9 +669,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32064,7 +31995,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -602,7 +603,7 @@
+@@ -603,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32073,7 +32004,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +641,9 @@
+@@ -641,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32112,7 +32043,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +602,7 @@
+@@ -602,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32121,7 +32052,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +640,9 @@
+@@ -640,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32160,7 +32091,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +598,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32169,7 +32100,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +636,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32208,7 +32139,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +600,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32217,7 +32148,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +638,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32256,7 +32187,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32265,7 +32196,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32304,7 +32235,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +604,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32313,7 +32244,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +642,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32352,7 +32283,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +605,7 @@
+@@ -605,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32361,7 +32292,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +643,9 @@
+@@ -643,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32373,45 +32304,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/Makefile.in
-+++ krita/plugins/viewplugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -251,6 +251,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@
-@@ -551,7 +554,7 @@
- all: docs-am all-recursive
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -589,9 +592,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
--- krita/plugins/viewplugins/colorrange/Makefile.in
+++ krita/plugins/viewplugins/colorrange/Makefile.in
@@ -1,4 +1,4 @@
@@ -32439,7 +32331,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32448,7 +32340,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32487,7 +32379,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32496,7 +32388,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32535,7 +32427,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +598,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32544,7 +32436,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +636,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32583,7 +32475,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32592,7 +32484,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32631,7 +32523,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32640,7 +32532,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32679,7 +32571,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32688,7 +32580,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32727,7 +32619,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +577,7 @@
+@@ -577,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32736,7 +32628,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +615,9 @@
+@@ -615,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32775,7 +32667,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +591,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32784,7 +32676,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +629,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32796,6 +32688,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- krita/plugins/viewplugins/Makefile.in
++++ krita/plugins/viewplugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -251,6 +251,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@
+@@ -551,7 +554,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -589,9 +592,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- krita/plugins/viewplugins/performancetest/Makefile.in
+++ krita/plugins/viewplugins/performancetest/Makefile.in
@@ -1,4 +1,4 @@
@@ -32823,7 +32754,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32832,7 +32763,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32871,7 +32802,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32880,7 +32811,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +627,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32919,7 +32850,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +591,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -32928,7 +32859,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +629,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32940,24 +32871,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/scripting/Makefile.in
-+++ krita/plugins/viewplugins/scripting/Makefile.in
+--- krita/plugins/viewplugins/scripting/kritacore/Makefile.in
++++ krita/plugins/viewplugins/scripting/kritacore/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -17,8 +17,6 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
-
--SOURCES = $(kritascripting_la_SOURCES)
+-SOURCES = $(krosskritacore_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -298,6 +296,9 @@
+@@ -308,6 +306,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32967,16 +32898,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +604,7 @@
+@@ -620,7 +621,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +642,9 @@
+@@ -658,9 +659,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32988,8 +32919,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/scripting/kritacore/Makefile.in
-+++ krita/plugins/viewplugins/scripting/kritacore/Makefile.in
+--- krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
++++ krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -33000,12 +32931,12 @@
@SET_MAKE@
--SOURCES = $(krosskritacore_la_SOURCES)
+-SOURCES = $(libkritascripting_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -308,6 +306,9 @@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33015,7 +32946,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -619,7 +620,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -33024,7 +32955,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -657,9 +658,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33034,26 +32965,26 @@
-$(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)
---- krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
-+++ krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
+--- krita/plugins/viewplugins/scripting/Makefile.in
++++ krita/plugins/viewplugins/scripting/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -16,8 +16,6 @@
- @SET_MAKE@
+@@ -17,8 +17,6 @@
--SOURCES = $(libkritascripting_la_SOURCES)
+
+-SOURCES = $(kritascripting_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -298,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33063,16 +32994,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -604,7 +605,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*) \
-@@ -623,9 +624,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33082,7 +33013,7 @@
-$(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)
--- krita/plugins/viewplugins/scripting/samples/Makefile.in
+++ krita/plugins/viewplugins/scripting/samples/Makefile.in
@@ -33102,7 +33033,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -537,7 +540,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -33111,7 +33042,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33141,7 +33072,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -528,7 +531,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -33150,7 +33081,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -566,9 +569,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33180,7 +33111,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -546,7 +549,7 @@
+@@ -547,7 +550,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -33189,7 +33120,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -584,9 +587,9 @@
+@@ -585,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33228,7 +33159,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +599,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -33237,7 +33168,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +637,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33276,7 +33207,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -33285,7 +33216,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +627,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33324,7 +33255,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -33333,7 +33264,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33372,7 +33303,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -33381,7 +33312,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33420,7 +33351,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -734,7 +735,7 @@
+@@ -735,7 +736,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -33429,7 +33360,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -772,9 +773,9 @@
+@@ -773,9 +774,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33441,69 +33372,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kspread/Makefile.in
-+++ kspread/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 483858 $
- # @configure_input@
-
-@@ -18,10 +18,6 @@
-
-
-
--#>- SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) $(libkspreadpart_la_SOURCES)
--#>+ 1
--SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) $(libkspreadpart_la_SOURCES) $(kspread_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -167,8 +163,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
-+#>- $(libkspreadpart_la_SOURCES)
-+#>+ 2
- SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
-- $(libkspreadpart_la_SOURCES)
-+ $(libkspreadpart_la_SOURCES) $(kspread_SOURCES)
- #>- DIST_SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
- #>- $(libkspreadpart_la_SOURCES)
- #>+ 2
-@@ -379,6 +378,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@
-@@ -739,7 +741,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -777,9 +779,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
--- kspread/dialogs/Makefile.in
+++ kspread/dialogs/Makefile.in
@@ -1,4 +1,4 @@
@@ -33531,7 +33399,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -692,7 +693,7 @@
+@@ -693,7 +694,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -33540,7 +33408,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -730,9 +731,9 @@
+@@ -731,9 +732,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33570,7 +33438,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -530,7 +533,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -33579,7 +33447,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33609,7 +33477,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -533,7 +536,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -33618,7 +33486,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -571,9 +574,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33630,15 +33498,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/pics/Makefile.in
-+++ kspread/pics/Makefile.in
+--- kspread/Makefile.in
++++ kspread/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -233,6 +233,9 @@
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) $(libkspreadpart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) $(libkspreadpart_la_SOURCES) $(kspread_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -167,8 +163,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
++#>- $(libkspreadpart_la_SOURCES)
++#>+ 2
+ SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
+- $(libkspreadpart_la_SOURCES)
++ $(libkspreadpart_la_SOURCES) $(kspread_SOURCES)
+ #>- DIST_SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
+ #>- $(libkspreadpart_la_SOURCES)
+ #>+ 2
+@@ -379,6 +378,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33648,16 +33540,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
- all: docs-am all-am
+@@ -740,7 +742,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -778,9 +780,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33667,17 +33559,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- kspread/plugins/Makefile.in
-+++ kspread/plugins/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kspread/pics/Makefile.in
++++ kspread/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: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33687,8 +33579,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -519,7 +522,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -33696,7 +33588,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33735,7 +33627,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +598,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -33744,7 +33636,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +636,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33774,7 +33666,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -33783,7 +33675,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33822,7 +33714,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +606,7 @@
+@@ -606,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -33831,7 +33723,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +644,9 @@
+@@ -644,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33843,15 +33735,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kspread/sheetstyles/Makefile.in
-+++ kspread/sheetstyles/Makefile.in
+--- kspread/plugins/Makefile.in
++++ kspread/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: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33861,8 +33753,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-am
+@@ -535,7 +538,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -33870,7 +33762,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33882,15 +33774,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/templates/Business/Makefile.in
-+++ kspread/templates/Business/Makefile.in
+--- kspread/sheetstyles/Makefile.in
++++ kspread/sheetstyles/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -245,6 +245,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33900,7 +33792,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -530,7 +533,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -33909,7 +33801,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33921,8 +33813,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/templates/General/Makefile.in
-+++ kspread/templates/General/Makefile.in
+--- kspread/templates/Business/Makefile.in
++++ kspread/templates/Business/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -33939,7 +33831,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -33948,7 +33840,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33960,8 +33852,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/templates/HomeFamily/Makefile.in
-+++ kspread/templates/HomeFamily/Makefile.in
+--- kspread/templates/General/Makefile.in
++++ kspread/templates/General/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -33978,7 +33870,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -33987,7 +33879,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33999,15 +33891,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/templates/Makefile.in
-+++ kspread/templates/Makefile.in
+--- kspread/templates/HomeFamily/Makefile.in
++++ kspread/templates/HomeFamily/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34017,8 +33909,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -536,7 +539,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -34026,7 +33918,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34038,24 +33930,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/tests/Makefile.in
-+++ kspread/tests/Makefile.in
+--- kspread/templates/Makefile.in
++++ kspread/templates/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libtests_la_SOURCES) $(formulatest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -279,6 +277,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34065,16 +33948,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +593,7 @@
+@@ -535,7 +538,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*) \
-@@ -630,9 +631,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34085,16 +33968,25 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
---- kspread/toolbar/Makefile.in
-+++ kspread/toolbar/Makefile.in
+ mostlyclean-libtool:
+--- kspread/tests/Makefile.in
++++ kspread/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libtests_la_SOURCES) $(formulatest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -279,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34104,16 +33996,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
- all: docs-am all-recursive
+@@ -593,7 +594,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*) \
-@@ -574,9 +577,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34124,7 +34016,7 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
+ clean-noinstLTLIBRARIES:
--- kspread/toolbar/crystalsvg/Makefile.in
+++ kspread/toolbar/crystalsvg/Makefile.in
@@ -1,4 +1,4 @@
@@ -34143,7 +34035,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -34152,7 +34044,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34164,15 +34056,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kugar/Makefile.in
-+++ kugar/Makefile.in
+--- kspread/toolbar/Makefile.in
++++ kspread/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: 483858 $
# @configure_input@
-@@ -250,6 +250,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34182,7 +34074,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -537,7 +540,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -34191,7 +34083,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34245,7 +34137,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -662,7 +664,7 @@
+@@ -663,7 +665,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34254,7 +34146,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -700,9 +702,9 @@
+@@ -701,9 +703,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34284,7 +34176,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -34293,7 +34185,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34323,7 +34215,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -545,7 +548,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -34332,7 +34224,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -583,9 +586,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34362,7 +34254,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -34371,7 +34263,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34401,7 +34293,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -34410,7 +34302,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34449,7 +34341,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34458,7 +34350,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34497,7 +34389,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +593,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34506,7 +34398,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +631,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34518,6 +34410,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- kugar/Makefile.in
++++ kugar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -250,6 +250,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@
+@@ -539,7 +542,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -577,9 +580,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- kugar/part/Makefile.in
+++ kugar/part/Makefile.in
@@ -1,4 +1,4 @@
@@ -34558,7 +34489,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -628,7 +629,7 @@
+@@ -629,7 +630,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34567,7 +34498,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -666,9 +667,9 @@
+@@ -667,9 +668,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34597,7 +34528,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -531,7 +534,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -34606,7 +34537,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -569,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34618,39 +34549,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kword/Makefile.in
-+++ kword/Makefile.in
+--- kword/data/Makefile.in
++++ kword/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: 483858 $
# @configure_input@
-@@ -18,10 +18,6 @@
-
-
-
--#>- SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
--#>+ 1
--SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES) $(kword_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -185,8 +181,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) \
-+#>- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
-+#>+ 2
- SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) \
-- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
-+ $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES) $(kword_SOURCES)
- #>- DIST_SOURCES = $(kword_la_SOURCES) \
- #>- $(libkwmailmerge_interface_la_SOURCES) \
- #>- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
-@@ -402,6 +401,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34660,16 +34567,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -808,7 +810,7 @@
+@@ -530,7 +533,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -846,9 +848,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34679,17 +34586,17 @@
-$(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)
---- kword/data/Makefile.in
-+++ kword/data/Makefile.in
+
+ mostlyclean-libtool:
+--- kword/dtd/Makefile.in
++++ kword/dtd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -247,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34699,7 +34606,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -34708,7 +34615,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34720,15 +34627,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kword/dtd/Makefile.in
-+++ kword/dtd/Makefile.in
+--- kword/expression/Makefile.in
++++ kword/expression/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -247,6 +247,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34738,7 +34645,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -530,7 +533,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -34747,7 +34654,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34759,8 +34666,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kword/expression/Makefile.in
-+++ kword/expression/Makefile.in
+--- kword/horizontalline/Makefile.in
++++ kword/horizontalline/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -34777,7 +34684,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -530,7 +533,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -34786,7 +34693,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34798,15 +34705,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kword/horizontalline/Makefile.in
-+++ kword/horizontalline/Makefile.in
+--- kword/mailmerge/kabc/Makefile.in
++++ kword/mailmerge/kabc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kwmailmerge_kabc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34816,16 +34732,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-am
+@@ -583,7 +584,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34835,10 +34751,10 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- kword/mailmerge/Makefile.in
-+++ kword/mailmerge/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kword/mailmerge/kspread/Makefile.in
++++ kword/mailmerge/kspread/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -34849,12 +34765,12 @@
@SET_MAKE@
--SOURCES = $(kwmailmerge_classic_la_SOURCES)
+-SOURCES = $(kwmailmerge_kspread_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -293,6 +291,9 @@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34864,7 +34780,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34873,7 +34789,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34885,8 +34801,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kword/mailmerge/kabc/Makefile.in
-+++ kword/mailmerge/kabc/Makefile.in
+--- kword/mailmerge/Makefile.in
++++ kword/mailmerge/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -34897,12 +34813,12 @@
@SET_MAKE@
--SOURCES = $(kwmailmerge_kabc_la_SOURCES)
+-SOURCES = $(kwmailmerge_classic_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -293,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34912,7 +34828,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34921,7 +34837,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34933,8 +34849,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kword/mailmerge/kspread/Makefile.in
-+++ kword/mailmerge/kspread/Makefile.in
+--- kword/mailmerge/sql/Makefile.in
++++ kword/mailmerge/sql/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -34945,12 +34861,12 @@
@SET_MAKE@
--SOURCES = $(kwmailmerge_kspread_la_SOURCES)
+-SOURCES = $(kwmailmerge_qtsqldb_la_SOURCES) $(kwmailmerge_qtsqldb_power_la_SOURCES) $(libmailmergesqlcommon_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -310,6 +308,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34960,7 +34876,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +585,7 @@
+@@ -626,7 +627,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34969,7 +34885,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +623,9 @@
+@@ -664,9 +665,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34981,24 +34897,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kword/mailmerge/sql/Makefile.in
-+++ kword/mailmerge/sql/Makefile.in
+--- kword/Makefile.in
++++ kword/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -16,8 +16,6 @@
- @SET_MAKE@
+@@ -18,10 +18,6 @@
--SOURCES = $(kwmailmerge_qtsqldb_la_SOURCES) $(kwmailmerge_qtsqldb_power_la_SOURCES) $(libmailmergesqlcommon_la_SOURCES)
+
+-#>- SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES) $(kword_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -310,6 +308,9 @@
+@@ -185,8 +181,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) \
++#>- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
++#>+ 2
+ SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) \
+- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
++ $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES) $(kword_SOURCES)
+ #>- DIST_SOURCES = $(kword_la_SOURCES) \
+ #>- $(libkwmailmerge_interface_la_SOURCES) \
+ #>- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
+@@ -402,6 +401,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35008,16 +34939,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -625,7 +626,7 @@
+@@ -809,7 +811,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)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -663,9 +664,9 @@
+@@ -847,9 +849,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35047,7 +34978,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -35056,7 +34987,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35086,7 +35017,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -537,7 +540,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -35095,7 +35026,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35125,7 +35056,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -537,7 +540,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -35134,7 +35065,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35164,7 +35095,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -35173,7 +35104,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35203,7 +35134,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -543,7 +546,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -35212,7 +35143,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -581,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35251,7 +35182,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +584,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35260,7 +35191,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +622,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35290,7 +35221,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -35299,7 +35230,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35311,15 +35242,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- lib/Makefile.in
-+++ lib/Makefile.in
+--- lib/kformula/config/Makefile.in
++++ lib/kformula/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: 483858 $
# @configure_input@
-@@ -251,6 +251,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35329,16 +35260,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
- all: docs-am all-recursive
+@@ -554,7 +557,7 @@
+ all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -592,9 +595,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35350,24 +35281,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- lib/kformula/Makefile.in
-+++ lib/kformula/Makefile.in
+--- lib/kformula/dtd/Makefile.in
++++ lib/kformula/dtd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkformulalib_la_SOURCES) $(kformulatest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -322,6 +320,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35377,16 +35299,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -635,7 +636,7 @@
+@@ -530,7 +533,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*) \
-@@ -673,9 +674,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35396,10 +35318,10 @@
-$(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)
---- lib/kformula/config/Makefile.in
-+++ lib/kformula/config/Makefile.in
+
+ mostlyclean-libtool:
+--- lib/kformula/fonts/Makefile.in
++++ lib/kformula/fonts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -35416,7 +35338,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -531,7 +534,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -35425,7 +35347,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -569,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35437,15 +35359,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- lib/kformula/dtd/Makefile.in
-+++ lib/kformula/dtd/Makefile.in
+--- lib/kformula/Makefile.in
++++ lib/kformula/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkformulalib_la_SOURCES) $(kformulatest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -322,6 +320,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35455,16 +35386,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-am
+@@ -636,7 +637,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*) \
-@@ -567,9 +570,9 @@
+@@ -674,9 +675,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35474,17 +35405,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- lib/kformula/fonts/Makefile.in
-+++ lib/kformula/fonts/Makefile.in
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- lib/kformula/pics/crystalsvg/Makefile.in
++++ lib/kformula/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: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35494,7 +35425,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -35503,7 +35434,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35533,7 +35464,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -35542,7 +35473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35554,45 +35485,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- lib/kformula/pics/crystalsvg/Makefile.in
-+++ lib/kformula/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: 483858 $
- # @configure_input@
-
-@@ -233,6 +233,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@
-@@ -519,7 +522,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*) \
-@@ -557,9 +560,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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:
--- lib/kofficecore/Makefile.in
+++ lib/kofficecore/Makefile.in
@@ -1,4 +1,4 @@
@@ -35620,7 +35512,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -715,7 +716,7 @@
+@@ -716,7 +717,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -35629,7 +35521,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -753,9 +754,9 @@
+@@ -754,9 +755,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35668,7 +35560,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -623,7 +624,7 @@
+@@ -624,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35677,7 +35569,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -661,9 +662,9 @@
+@@ -662,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35716,7 +35608,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -678,7 +679,7 @@
+@@ -679,7 +680,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35725,7 +35617,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -716,9 +717,9 @@
+@@ -717,9 +718,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35755,7 +35647,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -35764,7 +35656,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35794,7 +35686,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -526,7 +529,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -35803,7 +35695,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -564,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35842,7 +35734,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +591,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -35851,7 +35743,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +629,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35890,7 +35782,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -35899,7 +35791,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35911,8 +35803,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- lib/koproperty/Makefile.in
-+++ lib/koproperty/Makefile.in
+--- lib/koproperty/editors/Makefile.in
++++ lib/koproperty/editors/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -35923,12 +35815,12 @@
@SET_MAKE@
--SOURCES = $(libkoproperty_la_SOURCES)
+-SOURCES = $(libkopropertyeditors_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -294,6 +292,9 @@
+@@ -295,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35938,7 +35830,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35947,7 +35839,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35957,10 +35849,10 @@
-$(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)
---- lib/koproperty/editors/Makefile.in
-+++ lib/koproperty/editors/Makefile.in
+
+ clean-noinstLTLIBRARIES:
+--- lib/koproperty/Makefile.in
++++ lib/koproperty/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -35971,12 +35863,12 @@
@SET_MAKE@
--SOURCES = $(libkopropertyeditors_la_SOURCES)
+-SOURCES = $(libkoproperty_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -295,6 +293,9 @@
+@@ -294,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35986,7 +35878,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35995,7 +35887,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36005,8 +35897,8 @@
-$(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:
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- lib/koproperty/test/Makefile.in
+++ lib/koproperty/test/Makefile.in
@@ -1,4 +1,4 @@
@@ -36034,7 +35926,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -570,7 +571,7 @@
+@@ -571,7 +572,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36043,7 +35935,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -608,9 +609,9 @@
+@@ -609,9 +610,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36055,24 +35947,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
---- lib/kotext/Makefile.in
-+++ lib/kotext/Makefile.in
+--- lib/kotext/kohyphen/hyphdicts/Makefile.in
++++ lib/kotext/kohyphen/hyphdicts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkotext_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -322,6 +320,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36082,16 +35965,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -650,7 +651,7 @@
+@@ -531,7 +534,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -688,9 +689,9 @@
+@@ -569,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36101,8 +35984,8 @@
-$(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)
+
+ mostlyclean-libtool:
--- lib/kotext/kohyphen/Makefile.in
+++ lib/kotext/kohyphen/Makefile.in
@@ -1,4 +1,4 @@
@@ -36130,7 +36013,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +602,7 @@
+@@ -602,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -36139,7 +36022,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +640,9 @@
+@@ -640,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36151,15 +36034,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- lib/kotext/kohyphen/hyphdicts/Makefile.in
-+++ lib/kotext/kohyphen/hyphdicts/Makefile.in
+--- lib/kotext/Makefile.in
++++ lib/kotext/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkotext_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -322,6 +320,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36169,16 +36061,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
- all: docs-am all-am
+@@ -651,7 +652,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -689,9 +690,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36188,8 +36080,8 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- lib/kotext/tests/Makefile.in
+++ lib/kotext/tests/Makefile.in
@@ -1,4 +1,4 @@
@@ -36217,7 +36109,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36226,7 +36118,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36238,15 +36130,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkLTLIBRARIES:
---- lib/kross/Makefile.in
-+++ lib/kross/Makefile.in
+--- lib/kross/api/Makefile.in
++++ lib/kross/api/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkrossapi_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -302,6 +300,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36256,16 +36157,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -547,7 +550,7 @@
- all: docs-am all-recursive
+@@ -635,7 +636,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/lib/kross/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/lib/kross/Makefile.global $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +588,9 @@
+@@ -673,9 +674,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36275,10 +36176,10 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- lib/kross/api/Makefile.in
-+++ lib/kross/api/Makefile.in
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- lib/kross/main/Makefile.in
++++ lib/kross/main/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -36289,12 +36190,12 @@
@SET_MAKE@
--SOURCES = $(libkrossapi_la_SOURCES)
+-SOURCES = $(libkrossmain_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-@@ -302,6 +300,9 @@
+@@ -303,6 +301,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36304,7 +36205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -634,7 +635,7 @@
+@@ -622,7 +623,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36313,7 +36214,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -672,9 +673,9 @@
+@@ -660,9 +661,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36325,24 +36226,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- lib/kross/main/Makefile.in
-+++ lib/kross/main/Makefile.in
+--- lib/kross/Makefile.in
++++ lib/kross/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkrossmain_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -303,6 +301,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36352,16 +36244,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -621,7 +622,7 @@
+@@ -548,7 +551,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/lib/kross/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/lib/kross/Makefile.global $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -659,9 +660,9 @@
+@@ -586,9 +589,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36371,8 +36263,8 @@
-$(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)
+
+ mostlyclean-libtool:
--- lib/kross/python/CXX/Makefile.in
+++ lib/kross/python/CXX/Makefile.in
@@ -1,4 +1,4 @@
@@ -36400,7 +36292,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .c .cxx .lo .o .obj
@@ -36409,7 +36301,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36448,7 +36340,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +617,7 @@
+@@ -617,7 +618,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36457,7 +36349,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +655,9 @@
+@@ -655,9 +656,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36487,7 +36379,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -541,7 +544,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -36496,7 +36388,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -579,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36526,7 +36418,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -527,7 +530,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -36535,7 +36427,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -565,9 +568,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36574,7 +36466,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +584,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36583,7 +36475,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +622,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36622,7 +36514,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36631,7 +36523,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36670,7 +36562,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36679,7 +36571,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36718,7 +36610,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +596,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -36727,7 +36619,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +634,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36739,6 +36631,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- lib/Makefile.in
++++ 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: 483858 $
+ # @configure_input@
+
+@@ -251,6 +251,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@
+@@ -546,7 +549,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -584,9 +587,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- lib/store/Makefile.in
+++ lib/store/Makefile.in
@@ -1,4 +1,4 @@
@@ -36766,7 +36697,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36775,7 +36706,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36814,7 +36745,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +574,7 @@
+@@ -574,7 +575,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36823,7 +36754,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +612,9 @@
+@@ -612,9 +613,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36835,15 +36766,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
---- mimetypes/Makefile.in
-+++ mimetypes/Makefile.in
+--- 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: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -267,6 +267,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36853,27 +36784,48 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
- all: docs-am all-recursive
-
+@@ -566,7 +569,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -608,12 +611,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>- 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 $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- mostlyclean-libtool:
+ config.h: stamp-h1
+@@ -625,7 +628,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 $@
+@@ -1135,7 +1138,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=koffice.lsm Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs aclocal.m4 Doxyfile.temp p changes-1.4 configure.in.in acinclude.m4 Makefile.am changes-1.5 Makefile.am.in
++KDE_DIST=koffice.lsm stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs aclocal.m4 Doxyfile.temp p changes-1.4 configure.in.in acinclude.m4 configure Makefile.am changes-1.5 Makefile.am.in
+
+ #>+ 2
+ docs-am:
--- mimetypes/kde33/Makefile.in
+++ mimetypes/kde33/Makefile.in
@@ -1,4 +1,4 @@
@@ -36892,7 +36844,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -543,7 +546,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -36901,7 +36853,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -581,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36931,7 +36883,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -531,7 +534,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -36940,7 +36892,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -569,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36952,8 +36904,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- pics/Makefile.in
-+++ pics/Makefile.in
+--- mimetypes/Makefile.in
++++ mimetypes/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -36970,7 +36922,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -537,7 +540,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -36979,7 +36931,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37009,7 +36961,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -520,7 +523,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -37018,7 +36970,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37030,7 +36982,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -828,9 +831,9 @@
+@@ -829,9 +832,9 @@
$(INSTALL_DATA) $(srcdir)/cr22-action-newslide.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/newslide.png
$(INSTALL_DATA) $(srcdir)/cr16-action-tab_first.png $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/tab_first.png
$(INSTALL_DATA) $(srcdir)/cr22-action-frame_edit.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_edit.png
@@ -37041,7 +36993,7 @@
$(INSTALL_DATA) $(srcdir)/cr22-action-aotop.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/aotop.png
$(INSTALL_DATA) $(srcdir)/cr16-action-kdb_table.png $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/kdb_table.png
$(INSTALL_DATA) $(srcdir)/cr22-action-frame_image.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_image.png
-@@ -966,9 +969,9 @@
+@@ -967,9 +970,9 @@
-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/newslide.png
-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/tab_first.png
-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_edit.png
@@ -37052,8 +37004,8 @@
-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/aotop.png
-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/kdb_table.png
-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_image.png
---- plugins/Makefile.in
-+++ plugins/Makefile.in
+--- pics/Makefile.in
++++ 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.
@@ -37070,7 +37022,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -37079,7 +37031,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37091,24 +37043,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- plugins/scan/Makefile.in
-+++ plugins/scan/Makefile.in
+--- plugins/Makefile.in
++++ 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: 483858 $
# @configure_input@
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kofficescan_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -37118,16 +37061,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +585,7 @@
+@@ -535,7 +538,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*) \
-@@ -622,9 +623,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37137,17 +37080,26 @@
-$(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)
---- servicetypes/Makefile.in
-+++ servicetypes/Makefile.in
+
+ mostlyclean-libtool:
+--- plugins/scan/Makefile.in
++++ plugins/scan/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -243,6 +243,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kofficescan_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -37157,16 +37109,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
- all: docs-am all-am
+@@ -585,7 +586,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37176,17 +37128,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- templates/Makefile.in
-+++ templates/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- servicetypes/Makefile.in
++++ servicetypes/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -244,6 +244,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -37217,15 +37169,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- tools/Makefile.in
-+++ tools/Makefile.in
+--- templates/Makefile.in
++++ templates/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -37235,8 +37187,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -533,7 +536,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -37244,7 +37196,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -571,9 +574,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37283,7 +37235,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -559,7 +560,7 @@
+@@ -560,7 +561,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -37292,7 +37244,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -597,9 +598,9 @@
+@@ -598,9 +599,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37304,15 +37256,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
---- tools/kfile-plugins/Makefile.in
-+++ tools/kfile-plugins/Makefile.in
+--- tools/kfile-plugins/abiword/Makefile.in
++++ tools/kfile-plugins/abiword/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
-@@ -249,6 +249,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_abiword_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -37322,16 +37283,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -582,7 +583,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37341,10 +37302,10 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- tools/kfile-plugins/abiword/Makefile.in
-+++ tools/kfile-plugins/abiword/Makefile.in
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- tools/kfile-plugins/gnumeric/Makefile.in
++++ tools/kfile-plugins/gnumeric/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -37355,7 +37316,7 @@
--SOURCES = $(kfile_abiword_la_SOURCES)
+-SOURCES = $(kfile_gnumeric_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -37370,7 +37331,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -37379,7 +37340,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37391,8 +37352,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- tools/kfile-plugins/gnumeric/Makefile.in
-+++ tools/kfile-plugins/gnumeric/Makefile.in
+--- tools/kfile-plugins/koffice/Makefile.in
++++ tools/kfile-plugins/koffice/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -37403,7 +37364,7 @@
--SOURCES = $(kfile_gnumeric_la_SOURCES)
+-SOURCES = $(kfile_koffice_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -37418,7 +37379,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -37427,7 +37388,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37439,24 +37400,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- tools/kfile-plugins/koffice/Makefile.in
-+++ tools/kfile-plugins/koffice/Makefile.in
+--- tools/kfile-plugins/Makefile.in
++++ tools/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: 483858 $
# @configure_input@
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kfile_koffice_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -37466,16 +37418,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -535,7 +538,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*) \
-@@ -619,9 +620,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37485,8 +37437,8 @@
-$(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:
--- tools/kfile-plugins/ooo/Makefile.in
+++ tools/kfile-plugins/ooo/Makefile.in
@@ -1,4 +1,4 @@
@@ -37514,7 +37466,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -37523,7 +37475,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37575,7 +37527,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -37584,7 +37536,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37596,6 +37548,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- tools/Makefile.in
++++ 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: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,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@
+@@ -535,7 +538,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*) \
+@@ -573,9 +576,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
--- tools/quickprint/Makefile.in
+++ tools/quickprint/Makefile.in
@@ -1,4 +1,4 @@
@@ -37614,7 +37605,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -530,7 +533,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -37623,7 +37614,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37653,7 +37644,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -538,7 +541,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -37662,7 +37653,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37701,7 +37692,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -37710,7 +37701,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -37749,7 +37740,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -37758,7 +37749,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
More information about the pkg-kde-commits
mailing list